Skip to content

Commit 6ce8e21

Browse files
artemcmartemcm
authored
Merge pull request #67659 from artemcm/59NoPropertyMangledNameConstExtract
[5.9 🍒][Compile Time Constant Extraction] Deprecated extraction of property mangled names
2 parents 8e5e85a + 483e06f commit 6ce8e21

9 files changed

+53
-53
lines changed

‎lib/ConstExtract/ConstExtract.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ void writeProperties(llvm::json::OStream &JSON,
881881
const auto *decl = PropertyInfo.VarDecl;
882882
JSON.attribute("label", decl->getName().str().str());
883883
JSON.attribute("type", toFullyQualifiedTypeNameString(decl->getType()));
884-
JSON.attribute("mangledTypeName", toMangledTypeNameString(decl->getType()));
884+
JSON.attribute("mangledTypeName", "n/a - deprecated");
885885
JSON.attribute("isStatic", decl->isStatic() ? "true" : "false");
886886
JSON.attribute("isComputed", !decl->hasStorage() ? "true" : "false");
887887
writeLocationInformation(JSON, decl->getLoc(),

‎test/ConstExtraction/ExtractAnnotations.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public struct DeprecatedAnnotations: MyProto {}
4242
// CHECK-NEXT: {
4343
// CHECK-NEXT: "label": "available1",
4444
// CHECK-NEXT: "type": "Swift.String",
45-
// CHECK-NEXT: "mangledTypeName": "SS",
45+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
4646
// CHECK-NEXT: "isStatic": "false",
4747
// CHECK-NEXT: "isComputed": "true",
4848
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
@@ -67,7 +67,7 @@ public struct DeprecatedAnnotations: MyProto {}
6767
// CHECK-NEXT: {
6868
// CHECK-NEXT: "label": "deprecated1",
6969
// CHECK-NEXT: "type": "Swift.String",
70-
// CHECK-NEXT: "mangledTypeName": "SS",
70+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
7171
// CHECK-NEXT: "isStatic": "false",
7272
// CHECK-NEXT: "isComputed": "true",
7373
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
@@ -92,7 +92,7 @@ public struct DeprecatedAnnotations: MyProto {}
9292
// CHECK-NEXT: {
9393
// CHECK-NEXT: "label": "renamed1",
9494
// CHECK-NEXT: "type": "Swift.String",
95-
// CHECK-NEXT: "mangledTypeName": "SS",
95+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
9696
// CHECK-NEXT: "isStatic": "false",
9797
// CHECK-NEXT: "isComputed": "true",
9898
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",
@@ -112,7 +112,7 @@ public struct DeprecatedAnnotations: MyProto {}
112112
// CHECK-NEXT: {
113113
// CHECK-NEXT: "label": "introduced1",
114114
// CHECK-NEXT: "type": "Swift.String",
115-
// CHECK-NEXT: "mangledTypeName": "SS",
115+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
116116
// CHECK-NEXT: "isStatic": "false",
117117
// CHECK-NEXT: "isComputed": "true",
118118
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractAnnotations.swift",

‎test/ConstExtraction/ExtractCalls.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public struct Bat {
5151
// CHECK-NEXT: {
5252
// CHECK-NEXT: "label": "init1",
5353
// CHECK-NEXT: "type": "ExtractCalls.Bar",
54-
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BarV",
54+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
5555
// CHECK-NEXT: "isStatic": "false",
5656
// CHECK-NEXT: "isComputed": "false",
5757
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
@@ -65,7 +65,7 @@ public struct Bat {
6565
// CHECK-NEXT: {
6666
// CHECK-NEXT: "label": "init2",
6767
// CHECK-NEXT: "type": "ExtractCalls.Bat",
68-
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BatV",
68+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
6969
// CHECK-NEXT: "isStatic": "false",
7070
// CHECK-NEXT: "isComputed": "false",
7171
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
@@ -92,7 +92,7 @@ public struct Bat {
9292
// CHECK-NEXT: {
9393
// CHECK-NEXT: "label": "init3",
9494
// CHECK-NEXT: "type": "ExtractCalls.Bat",
95-
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BatV",
95+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
9696
// CHECK-NEXT: "isStatic": "false",
9797
// CHECK-NEXT: "isComputed": "false",
9898
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
@@ -118,7 +118,7 @@ public struct Bat {
118118
// CHECK-NEXT: {
119119
// CHECK-NEXT: "label": "func1",
120120
// CHECK-NEXT: "type": "Swift.Int",
121-
// CHECK-NEXT: "mangledTypeName": "Si",
121+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
122122
// CHECK-NEXT: "isStatic": "false",
123123
// CHECK-NEXT: "isComputed": "false",
124124
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
@@ -128,7 +128,7 @@ public struct Bat {
128128
// CHECK-NEXT: {
129129
// CHECK-NEXT: "label": "init4",
130130
// CHECK-NEXT: "type": "Swift.Optional<ExtractCalls.Bar>",
131-
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3BarVSg",
131+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
132132
// CHECK-NEXT: "isStatic": "true",
133133
// CHECK-NEXT: "isComputed": "false",
134134
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",
@@ -142,7 +142,7 @@ public struct Bat {
142142
// CHECK-NEXT: {
143143
// CHECK-NEXT: "label": "ext1",
144144
// CHECK-NEXT: "type": "ExtractCalls.Foo.Boo",
145-
// CHECK-NEXT: "mangledTypeName": "12ExtractCalls3FooV3BooV",
145+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
146146
// CHECK-NEXT: "isStatic": "false",
147147
// CHECK-NEXT: "isComputed": "true",
148148
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractCalls.swift",

‎test/ConstExtraction/ExtractEnums.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public struct Enums: MyProto {
4545
// CHECK-NEXT: {
4646
// CHECK-NEXT: "label": "hashValue",
4747
// CHECK-NEXT: "type": "Swift.Int",
48-
// CHECK-NEXT: "mangledTypeName": "Si",
48+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
4949
// CHECK-NEXT: "isStatic": "false",
5050
// CHECK-NEXT: "isComputed": "true",
5151
// CHECK-NEXT: "valueKind": "Runtime"
@@ -83,7 +83,7 @@ public struct Enums: MyProto {
8383
// CHECK-NEXT: {
8484
// CHECK-NEXT: "label": "rawValue",
8585
// CHECK-NEXT: "type": "Swift.String",
86-
// CHECK-NEXT: "mangledTypeName": "SS",
86+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
8787
// CHECK-NEXT: "isStatic": "false",
8888
// CHECK-NEXT: "isComputed": "true",
8989
// CHECK-NEXT: "valueKind": "Runtime"
@@ -153,7 +153,7 @@ public struct Enums: MyProto {
153153
// CHECK-NEXT: {
154154
// CHECK-NEXT: "label": "enum1",
155155
// CHECK-NEXT: "type": "ExtractEnums.SimpleEnum",
156-
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums10SimpleEnumO",
156+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
157157
// CHECK-NEXT: "isStatic": "false",
158158
// CHECK-NEXT: "isComputed": "false",
159159
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
@@ -166,7 +166,7 @@ public struct Enums: MyProto {
166166
// CHECK-NEXT: {
167167
// CHECK-NEXT: "label": "enum3",
168168
// CHECK-NEXT: "type": "ExtractEnums.AssociatedEnums",
169-
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums010AssociatedB0O",
169+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
170170
// CHECK-NEXT: "isStatic": "false",
171171
// CHECK-NEXT: "isComputed": "false",
172172
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
@@ -193,7 +193,7 @@ public struct Enums: MyProto {
193193
// CHECK-NEXT: {
194194
// CHECK-NEXT: "label": "enum2",
195195
// CHECK-NEXT: "type": "ExtractEnums.StringEnum",
196-
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums10StringEnumO",
196+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
197197
// CHECK-NEXT: "isStatic": "false",
198198
// CHECK-NEXT: "isComputed": "true",
199199
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",
@@ -206,7 +206,7 @@ public struct Enums: MyProto {
206206
// CHECK-NEXT: {
207207
// CHECK-NEXT: "label": "enum4",
208208
// CHECK-NEXT: "type": "ExtractEnums.AssociatedEnums",
209-
// CHECK-NEXT: "mangledTypeName": "12ExtractEnums010AssociatedB0O",
209+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
210210
// CHECK-NEXT: "isStatic": "false",
211211
// CHECK-NEXT: "isComputed": "true",
212212
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractEnums.swift",

‎test/ConstExtraction/ExtractGroups.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ extension String: Foo {}
5050
// CHECK-NEXT: {
5151
// CHECK-NEXT: "label": "array1",
5252
// CHECK-NEXT: "type": "Swift.Array<Swift.Int>",
53-
// CHECK-NEXT: "mangledTypeName": "SaySiG",
53+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
5454
// CHECK-NEXT: "isStatic": "false",
5555
// CHECK-NEXT: "isComputed": "false",
5656
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -74,7 +74,7 @@ extension String: Foo {}
7474
// CHECK-NEXT: {
7575
// CHECK-NEXT: "label": "array2",
7676
// CHECK-NEXT: "type": "Swift.Array<ExtractGroups.Foo>",
77-
// CHECK-NEXT: "mangledTypeName": "Say13ExtractGroups3Foo_pG",
77+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
7878
// CHECK-NEXT: "isStatic": "false",
7979
// CHECK-NEXT: "isComputed": "false",
8080
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -101,7 +101,7 @@ extension String: Foo {}
101101
// CHECK-NEXT: {
102102
// CHECK-NEXT: "label": "array3",
103103
// CHECK-NEXT: "type": "Swift.Array<ExtractGroups.Bar>",
104-
// CHECK-NEXT: "mangledTypeName": "Say13ExtractGroups3BarVG",
104+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
105105
// CHECK-NEXT: "isStatic": "false",
106106
// CHECK-NEXT: "isComputed": "false",
107107
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -133,7 +133,7 @@ extension String: Foo {}
133133
// CHECK-NEXT: {
134134
// CHECK-NEXT: "label": "dict1",
135135
// CHECK-NEXT: "type": "Swift.Dictionary<Swift.String, Swift.Int>",
136-
// CHECK-NEXT: "mangledTypeName": "SDySSSiG",
136+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
137137
// CHECK-NEXT: "isStatic": "false",
138138
// CHECK-NEXT: "isComputed": "false",
139139
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -175,7 +175,7 @@ extension String: Foo {}
175175
// CHECK-NEXT: {
176176
// CHECK-NEXT: "label": "dict2",
177177
// CHECK-NEXT: "type": "Swift.Dictionary<Swift.Int, Swift.Array<Swift.String>>",
178-
// CHECK-NEXT: "mangledTypeName": "SDySiSaySSGG",
178+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
179179
// CHECK-NEXT: "isStatic": "false",
180180
// CHECK-NEXT: "isComputed": "false",
181181
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -225,7 +225,7 @@ extension String: Foo {}
225225
// CHECK-NEXT: {
226226
// CHECK-NEXT: "label": "dict3",
227227
// CHECK-NEXT: "type": "Swift.Dictionary<Swift.String, ExtractGroups.Foo>",
228-
// CHECK-NEXT: "mangledTypeName": "SDySS13ExtractGroups3Foo_pG",
228+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
229229
// CHECK-NEXT: "isStatic": "false",
230230
// CHECK-NEXT: "isComputed": "false",
231231
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -273,7 +273,7 @@ extension String: Foo {}
273273
// CHECK-NEXT: {
274274
// CHECK-NEXT: "label": "tuple1",
275275
// CHECK-NEXT: "type": "(Swift.String, ExtractGroups.Bar)",
276-
// CHECK-NEXT: "mangledTypeName": "SS_13ExtractGroups3BarVt",
276+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
277277
// CHECK-NEXT: "isStatic": "false",
278278
// CHECK-NEXT: "isComputed": "false",
279279
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -298,7 +298,7 @@ extension String: Foo {}
298298
// CHECK-NEXT: {
299299
// CHECK-NEXT: "label": "tuple2",
300300
// CHECK-NEXT: "type": "(lat: Swift.Float, lng: Swift.Float)",
301-
// CHECK-NEXT: "mangledTypeName": "Sf3lat_Sf3lngt",
301+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
302302
// CHECK-NEXT: "isStatic": "false",
303303
// CHECK-NEXT: "isComputed": "false",
304304
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",
@@ -322,7 +322,7 @@ extension String: Foo {}
322322
// CHECK-NEXT: {
323323
// CHECK-NEXT: "label": "tuple3",
324324
// CHECK-NEXT: "type": "Swift.Void",
325-
// CHECK-NEXT: "mangledTypeName": "yt",
325+
// CHECK-NEXT: "mangledTypeName": "n/a - deprecated",
326326
// CHECK-NEXT: "isStatic": "false",
327327
// CHECK-NEXT: "isComputed": "false",
328328
// CHECK-NEXT: "file": "{{.*}}test{{/|\\\\}}ConstExtraction{{/|\\\\}}ExtractGroups.swift",

0 commit comments

Comments
 (0)