Skip to content

[5.9 🍒][Compile Time Constant Extraction] Deprecated extraction of property mangled names #67659

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
Aug 2, 2023
Merged

[5.9 🍒][Compile Time Constant Extraction] Deprecated extraction of property mangled names #67659

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
2 changes: 1 addition & 1 deletion lib/ConstExtract/ConstExtract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ void writeProperties(llvm::json::OStream &JSON,
const auto *decl = PropertyInfo.VarDecl;
JSON.attribute("label", decl->getName().str().str());
JSON.attribute("type", toFullyQualifiedTypeNameString(decl->getType()));
JSON.attribute("mangledTypeName", toMangledTypeNameString(decl->getType()));
JSON.attribute("mangledTypeName", "n/a - deprecated");
JSON.attribute("isStatic", decl->isStatic() ? "true" : "false");
JSON.attribute("isComputed", !decl->hasStorage() ? "true" : "false");
writeLocationInformation(JSON, decl->getLoc(),
Expand Down
8 changes: 4 additions & 4 deletions test/ConstExtraction/ExtractAnnotations.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public struct DeprecatedAnnotations: MyProto {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "available1",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "mangledTypeName": "SS",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
Expand All @@ -67,7 +67,7 @@ public struct DeprecatedAnnotations: MyProto {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "deprecated1",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "mangledTypeName": "SS",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
Expand All @@ -92,7 +92,7 @@ public struct DeprecatedAnnotations: MyProto {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "renamed1",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "mangledTypeName": "SS",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
Expand All @@ -112,7 +112,7 @@ public struct DeprecatedAnnotations: MyProto {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "introduced1",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "mangledTypeName": "SS",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
Expand Down
12 changes: 6 additions & 6 deletions test/ConstExtraction/ExtractCalls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public struct Bat {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "init1",
// CHECK-NEXT: "type": "ExtractCalls.Bar",
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BarV",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
Expand All @@ -65,7 +65,7 @@ public struct Bat {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "init2",
// CHECK-NEXT: "type": "ExtractCalls.Bat",
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BatV",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
Expand All @@ -92,7 +92,7 @@ public struct Bat {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "init3",
// CHECK-NEXT: "type": "ExtractCalls.Bat",
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BatV",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
Expand All @@ -118,7 +118,7 @@ public struct Bat {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "func1",
// CHECK-NEXT: "type": "Swift.Int",
// CHECK-NEXT: "mangledTypeName": "Si",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
Expand All @@ -128,7 +128,7 @@ public struct Bat {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "init4",
// CHECK-NEXT: "type": "Swift.Optional<ExtractCalls.Bar>",
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BarVSg",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "true",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
Expand All @@ -142,7 +142,7 @@ public struct Bat {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "ext1",
// CHECK-NEXT: "type": "ExtractCalls.Foo.Boo",
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3FooV3BooV",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
Expand Down
12 changes: 6 additions & 6 deletions test/ConstExtraction/ExtractEnums.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public struct Enums: MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "hashValue",
// CHECK-NEXT: "type": "Swift.Int",
// CHECK-NEXT: "mangledTypeName": "Si",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "valueKind": "Runtime"
Expand Down Expand Up @@ -83,7 +83,7 @@ public struct Enums: MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "rawValue",
// CHECK-NEXT: "type": "Swift.String",
// CHECK-NEXT: "mangledTypeName": "SS",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "valueKind": "Runtime"
Expand Down Expand Up @@ -153,7 +153,7 @@ public struct Enums: MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "enum1",
// CHECK-NEXT: "type": "ExtractEnums.SimpleEnum",
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums10SimpleEnumO",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
Expand All @@ -166,7 +166,7 @@ public struct Enums: MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "enum3",
// CHECK-NEXT: "type": "ExtractEnums.AssociatedEnums",
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums010AssociatedB0O",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
Expand All @@ -193,7 +193,7 @@ public struct Enums: MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "enum2",
// CHECK-NEXT: "type": "ExtractEnums.StringEnum",
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums10StringEnumO",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
Expand All @@ -206,7 +206,7 @@ public struct Enums: MyProto {
// CHECK-NEXT: {
// CHECK-NEXT: "label": "enum4",
// CHECK-NEXT: "type": "ExtractEnums.AssociatedEnums",
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums010AssociatedB0O",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "true",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
Expand Down
18 changes: 9 additions & 9 deletions test/ConstExtraction/ExtractGroups.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "array1",
// CHECK-NEXT: "type": "Swift.Array<Swift.Int>",
// CHECK-NEXT: "mangledTypeName": "SaySiG",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand All @@ -74,7 +74,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "array2",
// CHECK-NEXT: "type": "Swift.Array<ExtractGroups.Foo>",
// CHECK-NEXT: "mangledTypeName": "Say13ExtractGroups3Foo_pG",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand All @@ -101,7 +101,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "array3",
// CHECK-NEXT: "type": "Swift.Array<ExtractGroups.Bar>",
// CHECK-NEXT: "mangledTypeName": "Say13ExtractGroups3BarVG",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand Down Expand Up @@ -133,7 +133,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "dict1",
// CHECK-NEXT: "type": "Swift.Dictionary<Swift.String, Swift.Int>",
// CHECK-NEXT: "mangledTypeName": "SDySSSiG",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand Down Expand Up @@ -175,7 +175,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "dict2",
// CHECK-NEXT: "type": "Swift.Dictionary<Swift.Int, Swift.Array<Swift.String>>",
// CHECK-NEXT: "mangledTypeName": "SDySiSaySSGG",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand Down Expand Up @@ -225,7 +225,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "dict3",
// CHECK-NEXT: "type": "Swift.Dictionary<Swift.String, ExtractGroups.Foo>",
// CHECK-NEXT: "mangledTypeName": "SDySS13ExtractGroups3Foo_pG",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand Down Expand Up @@ -273,7 +273,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "tuple1",
// CHECK-NEXT: "type": "(Swift.String, ExtractGroups.Bar)",
// CHECK-NEXT: "mangledTypeName": "SS_13ExtractGroups3BarVt",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand All @@ -298,7 +298,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "tuple2",
// CHECK-NEXT: "type": "(lat: Swift.Float, lng: Swift.Float)",
// CHECK-NEXT: "mangledTypeName": "Sf3lat_Sf3lngt",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand All @@ -322,7 +322,7 @@ extension String: Foo {}
// CHECK-NEXT: {
// CHECK-NEXT: "label": "tuple3",
// CHECK-NEXT: "type": "Swift.Void",
// CHECK-NEXT: "mangledTypeName": "yt",
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
// CHECK-NEXT: "isStatic": "false",
// CHECK-NEXT: "isComputed": "false",
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
Expand Down
Loading