Skip to content

Commit 660990a

Browse files
mikeashmikeash
committed
[ExternalMetadataBuilder] Fix extra "target" key in output JSON.
We were emitting two "target" keys, one with the library name and one with the symbol name. Remove the library name, as we don't want it anyway.
1 parent 0cc5297 commit 660990a

File tree

2 files changed

+3
-33
lines changed

2 files changed

+3
-33
lines changed

‎lib/ExternalGenericMetadataBuilder/ExternalGenericMetadataBuilder.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2080,8 +2080,6 @@ void ExternalGenericMetadataBuilderContext<Runtime>::writeAtomContentsJSON(
20802080
J.object([&] {
20812081
if (auto *fileTarget =
20822082
std::get_if<FileTarget>(&targetsCursor->fileOrAtom)) {
2083-
J.attribute("target", fileTarget->file->path);
2084-
20852083
std::string foundSymbolName = "";
20862084
uint64_t foundSymbolAddress = 0;
20872085

‎test/ExternalGenericMetadataBuilder/ExternalGenericMetadataBuilder.swift

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %empty-directory(%t)
2-
32
// RUN: %target-build-swift -I %swift-lib-dir -I %swift_src_root/lib/ExternalGenericMetadataBuilder -L%swift-lib-dir -lswiftGenericMetadataBuilder -enable-experimental-feature Extern %s -o %t/ExternalMetadataBuilderTest
43
// RUN: %target-codesign %t/ExternalMetadataBuilderTest
54
// RUN: %target-run %t/ExternalMetadataBuilderTest
5+
66
// REQUIRES: executable_test
77
// REQUIRES: OS=macosx && CPU=arm64
88

@@ -69,11 +69,11 @@ ExternalGenericMetadataBuilderTests.test("JSON output") {
6969
expectNil(addDylibError)
7070
}
7171

72-
let buildErrorCStr = swift_externalMetadataBuilder_buildMetadata(builder);
72+
let buildErrorCStr = swift_externalMetadataBuilder_buildMetadata(builder)
7373
let buildError = buildErrorCStr.map { String(cString: $0) }
7474
expectNil(buildError)
7575

76-
let outputJSONCStr = swift_externalMetadataBuilder_getMetadataJSON(builder);
76+
let outputJSONCStr = swift_externalMetadataBuilder_getMetadataJSON(builder)
7777
let outputJSON = outputJSONCStr.map { String(cString: $0) }
7878
expectNotNil(outputJSON)
7979

@@ -120,19 +120,16 @@ var expectedJSON: String {
120120
},
121121
"0002000000000000",
122122
{
123-
"target": "ExternalMetadataBuilderTest",
124123
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMn",
125124
"addend": 0,
126125
"kind": "ptr64"
127126
},
128127
{
129-
"target": "/usr/lib/swift/libswiftCore.dylib",
130128
"target": "_$ss4Int8VN",
131129
"addend": 0,
132130
"kind": "ptr64"
133131
},
134132
{
135-
"target": "/usr/lib/swift/libswiftCore.dylib",
136133
"target": "_$ss5Int16VN",
137134
"addend": 0,
138135
"kind": "ptr64"
@@ -153,25 +150,21 @@ var expectedJSON: String {
153150
},
154151
"0002000000000000",
155152
{
156-
"target": "ExternalMetadataBuilderTest",
157153
"target": "_$s27ExternalMetadataBuilderTest13GenericStructVMn",
158154
"addend": 0,
159155
"kind": "ptr64"
160156
},
161157
{
162-
"target": "/usr/lib/swift/libswiftCore.dylib",
163158
"target": "_$ss4Int8VN",
164159
"addend": 0,
165160
"kind": "ptr64"
166161
},
167162
{
168-
"target": "/usr/lib/swift/libswiftCore.dylib",
169163
"target": "_$ss5Int16VN",
170164
"addend": 0,
171165
"kind": "ptr64"
172166
},
173167
{
174-
"target": "/usr/lib/swift/libswiftCore.dylib",
175168
"target": "_$sSdN",
176169
"addend": 0,
177170
"kind": "ptr64"
@@ -184,49 +177,41 @@ var expectedJSON: String {
184177
"contentType": "constData",
185178
"contents": [
186179
{
187-
"target": "ExternalMetadataBuilderTest",
188180
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
189181
"addend": 1032,
190182
"kind": "ptr64"
191183
},
192184
{
193-
"target": "ExternalMetadataBuilderTest",
194185
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
195186
"addend": 1376,
196187
"kind": "ptr64"
197188
},
198189
{
199-
"target": "ExternalMetadataBuilderTest",
200190
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
201191
"addend": 1536,
202192
"kind": "ptr64"
203193
},
204194
{
205-
"target": "ExternalMetadataBuilderTest",
206195
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
207196
"addend": 1768,
208197
"kind": "ptr64"
209198
},
210199
{
211-
"target": "/usr/lib/swift/libswiftCore.dylib",
212200
"target": "__swift_pod_copy",
213201
"addend": 0,
214202
"kind": "ptr64"
215203
},
216204
{
217-
"target": "ExternalMetadataBuilderTest",
218205
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
219206
"addend": 2200,
220207
"kind": "ptr64"
221208
},
222209
{
223-
"target": "ExternalMetadataBuilderTest",
224210
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
225211
"addend": 2420,
226212
"kind": "ptr64"
227213
},
228214
{
229-
"target": "ExternalMetadataBuilderTest",
230215
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
231216
"addend": 2864,
232217
"kind": "ptr64"
@@ -239,49 +224,41 @@ var expectedJSON: String {
239224
"contentType": "constData",
240225
"contents": [
241226
{
242-
"target": "ExternalMetadataBuilderTest",
243227
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
244228
"addend": 3520,
245229
"kind": "ptr64"
246230
},
247231
{
248-
"target": "ExternalMetadataBuilderTest",
249232
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
250233
"addend": 3892,
251234
"kind": "ptr64"
252235
},
253236
{
254-
"target": "ExternalMetadataBuilderTest",
255237
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
256238
"addend": 4052,
257239
"kind": "ptr64"
258240
},
259241
{
260-
"target": "ExternalMetadataBuilderTest",
261242
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
262243
"addend": 4312,
263244
"kind": "ptr64"
264245
},
265246
{
266-
"target": "/usr/lib/swift/libswiftCore.dylib",
267247
"target": "__swift_pod_copy",
268248
"addend": 0,
269249
"kind": "ptr64"
270250
},
271251
{
272-
"target": "ExternalMetadataBuilderTest",
273252
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
274253
"addend": 4796,
275254
"kind": "ptr64"
276255
},
277256
{
278-
"target": "ExternalMetadataBuilderTest",
279257
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
280258
"addend": 5044,
281259
"kind": "ptr64"
282260
},
283261
{
284-
"target": "ExternalMetadataBuilderTest",
285262
"target": "_$s27ExternalMetadataBuilderTest12GenericFieldVMa",
286263
"addend": 5160,
287264
"kind": "ptr64"
@@ -295,20 +272,17 @@ var expectedJSON: String {
295272
"contents": [
296273
"0000000000000000",
297274
{
298-
"target": "/usr/lib/swift/libswiftCore.dylib",
299275
"target": "_$sBbWV",
300276
"addend": 0,
301277
"kind": "ptr64"
302278
},
303279
"0002000000000000",
304280
{
305-
"target": "/usr/lib/swift/libswiftCore.dylib",
306281
"target": "_$sSaMn",
307282
"addend": 0,
308283
"kind": "ptr64"
309284
},
310285
{
311-
"target": "/usr/lib/swift/libswiftCore.dylib",
312286
"target": "_$sSdN",
313287
"addend": 0,
314288
"kind": "ptr64"
@@ -322,14 +296,12 @@ var expectedJSON: String {
322296
"contents": [
323297
"0000000000000000",
324298
{
325-
"target": "/usr/lib/swift/libswiftCore.dylib",
326299
"target": "_$sBbWV",
327300
"addend": 0,
328301
"kind": "ptr64"
329302
},
330303
"0002000000000000",
331304
{
332-
"target": "/usr/lib/swift/libswiftCore.dylib",
333305
"target": "_$sSaMn",
334306
"addend": 0,
335307
"kind": "ptr64"

0 commit comments

Comments
 (0)