Skip to content

[ExtractAPI] reorder the module names in extension symbol graph file names #119925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2024
Merged

[ExtractAPI] reorder the module names in extension symbol graph file names #119925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,9 +1067,8 @@ void SymbolGraphSerializer::serializeWithExtensionGraphs(

for (auto &ExtensionSGF : Serializer.ExtendedModules) {
if (auto ExtensionOS =
CreateOutputStream(ExtensionSGF.getKey() + "@" + API.ProductName))
Serializer.serializeGraphToStream(*ExtensionOS, Options,
ExtensionSGF.getKey(),
CreateOutputStream(API.ProductName + "@" + ExtensionSGF.getKey()))
Serializer.serializeGraphToStream(*ExtensionOS, Options, API.ProductName,
std::move(ExtensionSGF.getValue()));
}
}
Expand Down
9 changes: 8 additions & 1 deletion clang/test/ExtractAPI/objc_external_category.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ @interface ExtInterface
// Symbol graph from the build without extension SGFs should be identical to main symbol graph with extension SGFs
// RUN: diff %t/symbols/Module.symbols.json %t/ModuleNoExt.symbols.json

// RUN: FileCheck %s --input-file %t/symbols/ExternalModule@Module.symbols.json --check-prefix EXT
// RUN: FileCheck %s --input-file %t/symbols/Module@ExternalModule.symbols.json --check-prefix EXT
// EXT-DAG: "!testRelLabel": "memberOf $ c:objc(cs)ExtInterface(py)Property $ c:objc(cs)ExtInterface"
// EXT-DAG: "!testRelLabel": "memberOf $ c:objc(cs)ExtInterface(im)InstanceMethod $ c:objc(cs)ExtInterface"
// EXT-DAG: "!testRelLabel": "memberOf $ c:objc(cs)ExtInterface(cm)ClassMethod $ c:objc(cs)ExtInterface"
Expand All @@ -55,3 +55,10 @@ @interface ExtInterface
// EXT-DAG: "!testLabel": "c:objc(cs)ExtInterface(cm)ClassMethod"
// EXT-NOT: "!testLabel": "c:objc(cs)ExtInterface"
// EXT-NOT: "!testLabel": "c:objc(cs)ModInterface"

// Ensure that the 'module' metadata for the extension symbol graph should still reference the
// declaring module

// RUN: FileCheck %s --input-file %t/symbols/[email protected] --check-prefix META
// META: "module": {
// META-NEXT: "name": "Module",
Loading