Skip to content

Commit ffedfa9

Browse files
QuietMisdreavusQuietMisdreavus
committed
ExtractAPI: use zero-based indices for line/column in symbol graph
Other implementations of the symbol graph format use zero-based indices for source locations, which causes problems when combined with clang's current one-based indices. This commit sets ExtractAPI's symbol graph output to use zero-based indices to align with other implementations. Cherry-picked from llvm#71753. rdar://107639783
1 parent f9981c2 commit ffedfa9

21 files changed

+260
-260
lines changed

‎clang/lib/ExtractAPI/Serialization/SymbolGraphSerializer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ Object serializeSourcePosition(const PresumedLoc &Loc) {
105105
assert(Loc.isValid() && "invalid source position");
106106

107107
Object SourcePosition;
108-
SourcePosition["line"] = Loc.getLine();
109-
SourcePosition["character"] = Loc.getColumn();
108+
SourcePosition["line"] = Loc.getLine() - 1;
109+
SourcePosition["character"] = Loc.getColumn() - 1;
110110

111111
return SourcePosition;
112112
}

‎clang/test/ExtractAPI/anonymous_record_no_typedef.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ struct Vehicle {
105105
{
106106
"range": {
107107
"end": {
108-
"character": 29,
109-
"line": 3
108+
"character": 28,
109+
"line": 2
110110
},
111111
"start": {
112-
"character": 9,
113-
"line": 3
112+
"character": 8,
113+
"line": 2
114114
}
115115
},
116116
"text": "The type of vehicle."
@@ -127,8 +127,8 @@ struct Vehicle {
127127
},
128128
"location": {
129129
"position": {
130-
"character": 5,
131-
"line": 4
130+
"character": 4,
131+
"line": 3
132132
},
133133
"uri": "file://INPUT_DIR/input.h"
134134
},
@@ -163,8 +163,8 @@ struct Vehicle {
163163
},
164164
"location": {
165165
"position": {
166-
"character": 9,
167-
"line": 5
166+
"character": 8,
167+
"line": 4
168168
},
169169
"uri": "file://INPUT_DIR/input.h"
170170
},
@@ -206,8 +206,8 @@ struct Vehicle {
206206
},
207207
"location": {
208208
"position": {
209-
"character": 9,
210-
"line": 6
209+
"character": 8,
210+
"line": 5
211211
},
212212
"uri": "file://INPUT_DIR/input.h"
213213
},
@@ -256,12 +256,12 @@ struct Vehicle {
256256
{
257257
"range": {
258258
"end": {
259-
"character": 14,
260-
"line": 1
259+
"character": 13,
260+
"line": 0
261261
},
262262
"start": {
263-
"character": 5,
264-
"line": 1
263+
"character": 4,
264+
"line": 0
265265
}
266266
},
267267
"text": "A Vehicle"
@@ -278,8 +278,8 @@ struct Vehicle {
278278
},
279279
"location": {
280280
"position": {
281-
"character": 8,
282-
"line": 2
281+
"character": 7,
282+
"line": 1
283283
},
284284
"uri": "file://INPUT_DIR/input.h"
285285
},
@@ -328,8 +328,8 @@ struct Vehicle {
328328
},
329329
"location": {
330330
"position": {
331-
"character": 7,
332-
"line": 7
331+
"character": 6,
332+
"line": 6
333333
},
334334
"uri": "file://INPUT_DIR/input.h"
335335
},
@@ -379,8 +379,8 @@ struct Vehicle {
379379
},
380380
"location": {
381381
"position": {
382-
"character": 7,
383-
"line": 13
382+
"character": 6,
383+
"line": 12
384384
},
385385
"uri": "file://INPUT_DIR/input.h"
386386
},

‎clang/test/ExtractAPI/availability.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ void e(void) __attribute__((availability(tvos, unavailable)));
9898
},
9999
"location": {
100100
"position": {
101-
"character": 6,
102-
"line": 1
101+
"character": 5,
102+
"line": 0
103103
},
104104
"uri": "file://INPUT_DIR/input.h"
105105
},
@@ -172,8 +172,8 @@ void e(void) __attribute__((availability(tvos, unavailable)));
172172
},
173173
"location": {
174174
"position": {
175-
"character": 6,
176-
"line": 3
175+
"character": 5,
176+
"line": 2
177177
},
178178
"uri": "file://INPUT_DIR/input.h"
179179
},
@@ -256,8 +256,8 @@ void e(void) __attribute__((availability(tvos, unavailable)));
256256
},
257257
"location": {
258258
"position": {
259-
"character": 6,
260-
"line": 5
259+
"character": 5,
260+
"line": 4
261261
},
262262
"uri": "file://INPUT_DIR/input.h"
263263
},
@@ -356,8 +356,8 @@ void e(void) __attribute__((availability(tvos, unavailable)));
356356
},
357357
"location": {
358358
"position": {
359-
"character": 6,
360-
"line": 7
359+
"character": 5,
360+
"line": 6
361361
},
362362
"uri": "file://INPUT_DIR/input.h"
363363
},
@@ -438,8 +438,8 @@ void e(void) __attribute__((availability(tvos, unavailable)));
438438
},
439439
"location": {
440440
"position": {
441-
"character": 6,
442-
"line": 9
441+
"character": 5,
442+
"line": 8
443443
},
444444
"uri": "file://INPUT_DIR/input.h"
445445
},

‎clang/test/ExtractAPI/enum.c

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ enum {
164164
{
165165
"range": {
166166
"end": {
167-
"character": 22,
168-
"line": 1
167+
"character": 21,
168+
"line": 0
169169
},
170170
"start": {
171-
"character": 5,
172-
"line": 1
171+
"character": 4,
172+
"line": 0
173173
}
174174
},
175175
"text": "Kinds of vehicles"
@@ -186,8 +186,8 @@ enum {
186186
},
187187
"location": {
188188
"position": {
189-
"character": 6,
190-
"line": 2
189+
"character": 5,
190+
"line": 1
191191
},
192192
"uri": "file://INPUT_DIR/input.h"
193193
},
@@ -228,8 +228,8 @@ enum {
228228
},
229229
"location": {
230230
"position": {
231-
"character": 3,
232-
"line": 3
231+
"character": 2,
232+
"line": 2
233233
},
234234
"uri": "file://INPUT_DIR/input.h"
235235
},
@@ -271,8 +271,8 @@ enum {
271271
},
272272
"location": {
273273
"position": {
274-
"character": 3,
275-
"line": 4
274+
"character": 2,
275+
"line": 3
276276
},
277277
"uri": "file://INPUT_DIR/input.h"
278278
},
@@ -309,12 +309,12 @@ enum {
309309
{
310310
"range": {
311311
"end": {
312-
"character": 45,
313-
"line": 5
312+
"character": 44,
313+
"line": 4
314314
},
315315
"start": {
316-
"character": 15,
317-
"line": 5
316+
"character": 14,
317+
"line": 4
318318
}
319319
},
320320
"text": "Move this to the top! -Sheldon"
@@ -331,8 +331,8 @@ enum {
331331
},
332332
"location": {
333333
"position": {
334-
"character": 3,
335-
"line": 5
334+
"character": 2,
335+
"line": 4
336336
},
337337
"uri": "file://INPUT_DIR/input.h"
338338
},
@@ -374,8 +374,8 @@ enum {
374374
},
375375
"location": {
376376
"position": {
377-
"character": 3,
378-
"line": 6
377+
"character": 2,
378+
"line": 5
379379
},
380380
"uri": "file://INPUT_DIR/input.h"
381381
},
@@ -417,8 +417,8 @@ enum {
417417
},
418418
"location": {
419419
"position": {
420-
"character": 3,
421-
"line": 7
420+
"character": 2,
421+
"line": 6
422422
},
423423
"uri": "file://INPUT_DIR/input.h"
424424
},
@@ -481,8 +481,8 @@ enum {
481481
},
482482
"location": {
483483
"position": {
484-
"character": 6,
485-
"line": 10
484+
"character": 5,
485+
"line": 9
486486
},
487487
"uri": "file://INPUT_DIR/input.h"
488488
},
@@ -523,8 +523,8 @@ enum {
523523
},
524524
"location": {
525525
"position": {
526-
"character": 3,
527-
"line": 11
526+
"character": 2,
527+
"line": 10
528528
},
529529
"uri": "file://INPUT_DIR/input.h"
530530
},
@@ -566,8 +566,8 @@ enum {
566566
},
567567
"location": {
568568
"position": {
569-
"character": 3,
570-
"line": 12
569+
"character": 2,
570+
"line": 11
571571
},
572572
"uri": "file://INPUT_DIR/input.h"
573573
},
@@ -609,8 +609,8 @@ enum {
609609
},
610610
"location": {
611611
"position": {
612-
"character": 3,
613-
"line": 13
612+
"character": 2,
613+
"line": 12
614614
},
615615
"uri": "file://INPUT_DIR/input.h"
616616
},
@@ -652,8 +652,8 @@ enum {
652652
},
653653
"location": {
654654
"position": {
655-
"character": 3,
656-
"line": 14
655+
"character": 2,
656+
"line": 13
657657
},
658658
"uri": "file://INPUT_DIR/input.h"
659659
},
@@ -708,8 +708,8 @@ enum {
708708
},
709709
"location": {
710710
"position": {
711-
"character": 1,
712-
"line": 17
711+
"character": 0,
712+
"line": 16
713713
},
714714
"uri": "file://INPUT_DIR/input.h"
715715
},
@@ -744,8 +744,8 @@ enum {
744744
},
745745
"location": {
746746
"position": {
747-
"character": 3,
748-
"line": 18
747+
"character": 2,
748+
"line": 17
749749
},
750750
"uri": "file://INPUT_DIR/input.h"
751751
},
@@ -800,8 +800,8 @@ enum {
800800
},
801801
"location": {
802802
"position": {
803-
"character": 1,
804-
"line": 21
803+
"character": 0,
804+
"line": 20
805805
},
806806
"uri": "file://INPUT_DIR/input.h"
807807
},
@@ -836,8 +836,8 @@ enum {
836836
},
837837
"location": {
838838
"position": {
839-
"character": 3,
840-
"line": 22
839+
"character": 2,
840+
"line": 21
841841
},
842842
"uri": "file://INPUT_DIR/input.h"
843843
},

0 commit comments

Comments
 (0)