Index: clang-tools-extra/clang-doc/Mapper.cpp
===================================================================
--- clang-tools-extra/clang-doc/Mapper.cpp
+++ clang-tools-extra/clang-doc/Mapper.cpp
@@ -28,6 +28,10 @@
   if (D->getASTContext().getSourceManager().isInSystemHeader(D->getLocation()))
     return true;
 
+  // Skip function-internal decls.
+  if (const auto *F = D->getParentFunctionOrMethod())
+    return true;
+
   llvm::SmallString<128> USR;
   // If there is an error generating a USR for the decl, skip this decl.
   if (index::generateUSRForDecl(D, USR))
Index: clang-tools-extra/test/clang-doc/bc-record.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/bc-record.cpp
+++ clang-tools-extra/test/clang-doc/bc-record.cpp
@@ -16,7 +16,6 @@
 // RUN: llvm-bcanalyzer %t/docs/bc/BD2BDEBD423F80BACCEA75DE6D6622D355FC2D17.bc --dump | FileCheck %s --check-prefix CHECK-EDES
 // RUN: llvm-bcanalyzer %t/docs/bc/E3B54702FABFF4037025BA194FC27C47006330B5.bc --dump | FileCheck %s --check-prefix CHECK-F
 // RUN: llvm-bcanalyzer %t/docs/bc/B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E.bc --dump | FileCheck %s --check-prefix CHECK-H
-// RUN: llvm-bcanalyzer %t/docs/bc/6BA1EE2B3DAEACF6E4306F10AF44908F4807927C.bc --dump | FileCheck %s --check-prefix CHECK-I
 // RUN: llvm-bcanalyzer %t/docs/bc/5093D428CDC62096A67547BA52566E4FB9404EEE.bc --dump | FileCheck %s --check-prefix CHECK-PM
 // RUN: llvm-bcanalyzer %t/docs/bc/CA7C7935730B5EACD25F080E9C83FA087CCDC75E.bc --dump | FileCheck %s --check-prefix CHECK-X
 // RUN: llvm-bcanalyzer %t/docs/bc/641AB4A3D36399954ACDE29C7A8833032BF40472.bc --dump | FileCheck %s --check-prefix CHECK-Y
@@ -27,7 +26,7 @@
 // CHECK-H: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-H-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
   // CHECK-H-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-  // CHECK-H-NEXT: <DefLocation abbrevid=6 op0=24 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-H-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-6]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-H-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-H-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
       // CHECK-H-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
@@ -36,25 +35,11 @@
   // CHECK-H-NEXT: </TypeBlock>
 // CHECK-H-NEXT: </FunctionBlock>
 
-
-// CHECK-I: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-I-NEXT: <USR abbrevid=4 op0=20 op1=107 op2=161 op3=238 op4=43 op5=61 op6=174 op7=172 op8=246 op9=228 op10=48 op11=111 op12=16 op13=175 op14=68 op15=144 op16=143 op17=72 op18=7 op19=146 op20=124/>
-  // CHECK-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'I'
-  // CHECK-I-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-I-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
-    // CHECK-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-    // CHECK-I-NEXT: <RefType abbrevid=6 op0=3/>
-    // CHECK-I-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-I-NEXT: </ReferenceBlock>
-  // CHECK-I-NEXT: <DefLocation abbrevid=6 op0=25 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-I-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-I-NEXT: </RecordBlock>
-
 union A { int X; int Y; };
 // CHECK-A: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-A-NEXT: <USR abbrevid=4 op0=20 op1=172 op2=232 op3=26 op4=250 op5=102 op6=39 op7=180 op8=206 op9=242 op10=180 op11=86 op12=251 op13=110 op14=18 op15=82 op16=146 op17=86 op18=116 op19=175 op20=126/>
   // CHECK-A-NEXT: <Name abbrevid=5 op0=1/> blob data = 'A'
-  // CHECK-A-NEXT: <DefLocation abbrevid=6 op0=53 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-A-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-4]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-A-NEXT: <TagType abbrevid=8 op0=2/>
   // CHECK-A-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-A-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
@@ -78,7 +63,7 @@
 // CHECK-B: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-B-NEXT: <USR abbrevid=4 op0=20 op1=252 op2=7 op3=189 op4=52 op5=213 op6=231 op7=119 op8=130 op9=194 op10=99 op11=250 op12=148 op13=68 op14=71 op15=146 op16=158 op17=168 op18=117 op19=55 op20=64/>
   // CHECK-B-NEXT: <Name abbrevid=5 op0=1/> blob data = 'B'
-  // CHECK-B-NEXT: <DefLocation abbrevid=6 op0=77 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-B-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-4]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-B-NEXT: <Member abbrevid=8 op0=1/> blob data = 'X'
   // CHECK-B-NEXT: <Member abbrevid=8 op0=1/> blob data = 'Y'
 // CHECK-B-NEXT: </EnumBlock>
@@ -87,7 +72,7 @@
 // CHECK-BC: <EnumBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-BC-NEXT: <USR abbrevid=4 op0=20 op1=30 op2=52 op3=56 op4=160 op5=139 op6=162 op7=32 op8=37 op9=192 op10=180 op11=98 op12=137 op13=255 op14=6 op15=134 op16=249 op17=44 op18=137 op19=36 op20=197/>
   // CHECK-BC-NEXT: <Name abbrevid=5 op0=2/> blob data = 'Bc'
-  // CHECK-BC-NEXT: <DefLocation abbrevid=6 op0=86 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-BC-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-4]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-BC-NEXT: <Scoped abbrevid=9 op0=1/>
   // CHECK-BC-NEXT: <Member abbrevid=8 op0=1/> blob data = 'A'
   // CHECK-BC-NEXT: <Member abbrevid=8 op0=1/> blob data = 'B'
@@ -97,7 +82,7 @@
 // CHECK-C: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-C-NEXT: <USR abbrevid=4 op0=20 op1=6 op2=181 op3=246 op4=161 op5=155 op6=169 op7=246 op8=168 op9=50 op10=225 op11=39 op12=201 op13=150 op14=130 op15=130 op16=185 op17=70 op18=25 op19=178 op20=16/>
   // CHECK-C-NEXT: <Name abbrevid=5 op0=1/> blob data = 'C'
-  // CHECK-C-NEXT: <DefLocation abbrevid=6 op0=96 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-C-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-4]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-C-NEXT: <MemberTypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-C-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
       // CHECK-C-NEXT: <Name abbrevid=5 op0=3/> blob data = 'int'
@@ -112,7 +97,7 @@
 // CHECK-D: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-D-NEXT: <USR abbrevid=4 op0=20 op1=9 op2=33 op3=115 op4=117 op5=65 op6=32 op7=139 op8=143 op9=169 op10=187 op11=66 op12=182 op13=15 op14=120 op15=172 op16=29 op17=119 op18=154 op19=160 op20=84/>
   // CHECK-D-NEXT: <Name abbrevid=5 op0=1/> blob data = 'D'
-  // CHECK-D-NEXT: <DefLocation abbrevid=6 op0=111 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-D-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-4]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-D-NEXT: <TagType abbrevid=8 op0=3/>
 // CHECK-D-NEXT: </RecordBlock>
 
@@ -127,7 +112,7 @@
 // CHECK-E: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-E-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
   // CHECK-E-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
-  // CHECK-E-NEXT: <DefLocation abbrevid=6 op0=119 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-E-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-11]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-E-NEXT: <TagType abbrevid=8 op0=3/>
 // CHECK-E-NEXT: </RecordBlock>
 
@@ -141,7 +126,7 @@
       // CHECK-ECON-NEXT: <Field abbrevid=7 op0=1/>
     // CHECK-ECON-NEXT: </ReferenceBlock>
   // CHECK-ECON-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-ECON-NEXT: <DefLocation abbrevid=6 op0=121 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-ECON-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-23]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-ECON-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-ECON-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
     // CHECK-ECON-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
@@ -166,7 +151,7 @@
     // CHECK-EDES-NEXT: <Field abbrevid=7 op0=1/>
   // CHECK-EDES-NEXT: </ReferenceBlock>
   // CHECK-EDES-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-EDES-NEXT: <DefLocation abbrevid=6 op0=122 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-EDES-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-47]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-EDES-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-EDES-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
     // CHECK-EDES-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
@@ -192,8 +177,8 @@
     // CHECK-PM-NEXT: <Field abbrevid=7 op0=1/>
   // CHECK-PM-NEXT: </ReferenceBlock>
   // CHECK-PM-NEXT: <IsMethod abbrevid=9 op0=1/>
-  // CHECK-PM-NEXT: <DefLocation abbrevid=6 op0=184 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-PM-NEXT: <Location abbrevid=7 op0=125 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-PM-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-11]] op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-PM-NEXT: <Location abbrevid=7 op0=[[@LINE-71]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-PM-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-PM-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
     // CHECK-PM-NEXT: <Name abbrevid=5 op0=1/> blob data = 'E'
@@ -214,7 +199,7 @@
 // CHECK-F: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=227 op2=181 op3=71 op4=2 op5=250 op6=191 op7=244 op8=3 op9=112 op10=37 op11=186 op12=25 op13=79 op14=194 op15=124 op16=71 op17=0 op18=99 op19=48 op20=181/>
   // CHECK-F-NEXT: <Name abbrevid=5 op0=1/> blob data = 'F'
-  // CHECK-F-NEXT: <DefLocation abbrevid=6 op0=213 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-F-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-4]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-F-NEXT: <TagType abbrevid=8 op0=3/>
   // CHECK-F-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-F-NEXT: <USR abbrevid=4 op0=20 op1=40 op2=149 op3=132 op4=168 op5=224 op6=255 op7=65 op8=120 op9=167 op10=148 op11=98 op12=42 op13=84 op14=122 op15=166 op16=34 op17=80 op18=57 op19=103 op20=161/>
@@ -236,7 +221,7 @@
 // CHECK-X: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-X-NEXT: <USR abbrevid=4 op0=20 op1=202 op2=124 op3=121 op4=53 op5=115 op6=11 op7=94 op8=172 op9=210 op10=95 op11=8 op12=14 op13=156 op14=131 op15=250 op16=8 op17=124 op18=205 op19=199 op20=94/>
   // CHECK-X-NEXT: <Name abbrevid=5 op0=1/> blob data = 'X'
-  // CHECK-X-NEXT: <DefLocation abbrevid=6 op0=233 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-X-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-6]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-X-NEXT: <TagType abbrevid=8 op0=3/>
 // CHECK-X-NEXT: </RecordBlock>
 
@@ -249,6 +234,6 @@
     // CHECK-Y-NEXT: <RefType abbrevid=6 op0=2/>
     // CHECK-Y-NEXT: <Field abbrevid=7 op0=1/>
   // CHECK-Y-NEXT: </ReferenceBlock>
-  // CHECK-Y-NEXT: <DefLocation abbrevid=6 op0=234 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-Y-NEXT: <DefLocation abbrevid=6 op0=[[@LINE-18]] op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-Y-NEXT: <TagType abbrevid=8 op0=3/>
 // CHECK-Y-NEXT: </RecordBlock>
Index: clang-tools-extra/test/clang-doc/mapper-class-in-function.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/mapper-class-in-function.cpp
+++ clang-tools-extra/test/clang-doc/mapper-class-in-function.cpp
@@ -7,7 +7,6 @@
 // RUN: cp "%s" "%t/test.cpp"
 // RUN: clang-doc --dump-mapper -doxygen -p %t %t/test.cpp -output=%t/docs
 // RUN: llvm-bcanalyzer %t/docs/bc/B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E.bc --dump | FileCheck %s --check-prefix CHECK-H
-// RUN: llvm-bcanalyzer %t/docs/bc/01A95F3F73F53281B3E50109A577FD2493159365.bc --dump | FileCheck %s --check-prefix CHECK-H-I
 
 void H() {
   class I {};
@@ -20,7 +19,7 @@
 // CHECK-H-NEXT: <FunctionBlock NumWords={{[0-9]*}} BlockCodeSize=4>
   // CHECK-H-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
   // CHECK-H-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-  // CHECK-H-NEXT: <DefLocation abbrevid=6 op0=12 op1={{[0-9]*}}/> blob data = '{{.*}}'
+  // CHECK-H-NEXT: <DefLocation abbrevid=6 op0=11 op1={{[0-9]*}}/> blob data = '{{.*}}'
   // CHECK-H-NEXT: <TypeBlock NumWords={{[0-9]*}} BlockCodeSize=4>
     // CHECK-H-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
       // CHECK-H-NEXT: <Name abbrevid=5 op0=4/> blob data = 'void'
@@ -28,22 +27,3 @@
     // CHECK-H-NEXT: </ReferenceBlock>
   // CHECK-H-NEXT: </TypeBlock>
 // CHECK-H-NEXT: </FunctionBlock>
-
-// CHECK-H-I: <BLOCKINFO_BLOCK/>
-// CHECK-H-I-NEXT: <VersionBlock NumWords=1 BlockCodeSize=4>
-  // CHECK-H-I-NEXT: <Version abbrevid=4 op0=2/>
-// CHECK-H-I-NEXT: </VersionBlock>
-// CHECK-H-I-NEXT: <RecordBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-  // CHECK-H-I-NEXT: <USR abbrevid=4 op0=20 op1=1 op2=169 op3=95 op4=63 op5=115 op6=245 op7=50 op8=129 op9=179 op10=229 op11=1 op12=9 op13=165 op14=119 op15=253 op16=36 op17=147 op18=21 op19=147 op20=101/>
-  // CHECK-H-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'I'
-  // CHECK-H-I-NEXT: <ReferenceBlock NumWords={{[0-9]*}} BlockCodeSize=4>
-    // CHECK-H-I-NEXT: <USR abbrevid=4 op0=20 op1=182 op2=172 op3=76 op4=92 op5=159 op6=46 op7=163 op8=242 op9=179 op10=236 op11=225 op12=163 op13=61 op14=52 op15=159 op16=78 op17=229 op18=2 op19=178 op20=78/>
-    // CHECK-H-I-NEXT: <Name abbrevid=5 op0=1/> blob data = 'H'
-    // CHECK-H-I-NEXT: <RefType abbrevid=6 op0=3/>
-    // CHECK-H-I-NEXT: <Field abbrevid=7 op0=1/>
-  // CHECK-H-I-NEXT: </ReferenceBlock>
-  // CHECK-H-I-NEXT: <DefLocation abbrevid=6 op0=13 op1={{[0-9]*}}/> blob data = '{{.*}}'
-  // CHECK-H-I-NEXT: <TagType abbrevid=8 op0=3/>
-// CHECK-H-I-NEXT: </RecordBlock>
-
-
Index: clang-tools-extra/test/clang-doc/yaml-record.cpp
===================================================================
--- clang-tools-extra/test/clang-doc/yaml-record.cpp
+++ clang-tools-extra/test/clang-doc/yaml-record.cpp
@@ -16,7 +16,6 @@
 // RUN: cat %t/docs/X.yaml | FileCheck %s --check-prefix=CHECK-X
 // RUN: cat %t/docs/X/Y.yaml | FileCheck %s --check-prefix=CHECK-Y
 // RUN: cat %t/docs/H.yaml | FileCheck %s --check-prefix=CHECK-H
-// RUN: cat %t/docs/H/I.yaml | FileCheck %s --check-prefix=CHECK-I
 
 union A { int X; int Y; };
 
@@ -24,7 +23,7 @@
 // CHECK-A-NEXT: USR:             'ACE81AFA6627B4CEF2B456FB6E1252925674AF7E'
 // CHECK-A-NEXT: Name:            'A'
 // CHECK-A-NEXT: DefLocation:     
-// CHECK-A-NEXT:   LineNumber:      21
+// CHECK-A-NEXT:   LineNumber:      [[@LINE-6]]
 // CHECK-A-NEXT:   Filename:        '{{.*}}'
 // CHECK-A-NEXT: TagType:         Union
 // CHECK-A-NEXT: Members:         
@@ -43,7 +42,7 @@
 // CHECK-B-NEXT: USR:             'FC07BD34D5E77782C263FA944447929EA8753740'
 // CHECK-B-NEXT: Name:            'B'
 // CHECK-B-NEXT: DefLocation:     
-// CHECK-B-NEXT:   LineNumber:      40
+// CHECK-B-NEXT:   LineNumber:      [[@LINE-6]]
 // CHECK-B-NEXT:   Filename:        '{{.*}}'
 // CHECK-B-NEXT: Members:         
 // CHECK-B-NEXT:   - 'X'
@@ -56,7 +55,7 @@
 // CHECK-BC-NEXT: USR:             '1E3438A08BA22025C0B46289FF0686F92C8924C5'
 // CHECK-BC-NEXT: Name:            'Bc'
 // CHECK-BC-NEXT: DefLocation:     
-// CHECK-BC-NEXT:   LineNumber:      53
+// CHECK-BC-NEXT:   LineNumber:      [[@LINE-6]]
 // CHECK-BC-NEXT:   Filename:        '{{.*}}'
 // CHECK-BC-NEXT: Scoped:          true
 // CHECK-BC-NEXT: Members:         
@@ -70,7 +69,7 @@
 // CHECK-C-NEXT: USR:             '06B5F6A19BA9F6A832E127C9968282B94619B210'
 // CHECK-C-NEXT: Name:            'C'
 // CHECK-C-NEXT: DefLocation:     
-// CHECK-C-NEXT:   LineNumber:      67
+// CHECK-C-NEXT:   LineNumber:      [[@LINE-6]]
 // CHECK-C-NEXT:   Filename:        '{{.*}}'
 // CHECK-C-NEXT: Members:         
 // CHECK-C-NEXT:   - Type:            
@@ -84,7 +83,7 @@
 // CHECK-D-NEXT: USR:             '0921737541208B8FA9BB42B60F78AC1D779AA054'
 // CHECK-D-NEXT: Name:            'D'
 // CHECK-D-NEXT: DefLocation:     
-// CHECK-D-NEXT:   LineNumber:      81
+// CHECK-D-NEXT:   LineNumber:      [[@LINE-6]]
 // CHECK-D-NEXT:   Filename:        '{{.*}}'
 // CHECK-D-NEXT: TagType:         Class
 // CHECK-D-NEXT: ...
@@ -101,7 +100,7 @@
 // CHECK-ECON-NEXT:     Name:            'E'
 // CHECK-ECON-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
 // CHECK-ECON-NEXT: DefLocation:
-// CHECK-ECON-NEXT:   LineNumber:      94
+// CHECK-ECON-NEXT:   LineNumber:      [[@LINE-10]]
 // CHECK-ECON-NEXT:   Filename:        '{{.*}}'
 // CHECK-ECON-NEXT: IsMethod:        true
 // CHECK-ECON-NEXT: Parent:          
@@ -123,7 +122,7 @@
 // CHECK-EDES-NEXT:     Name:            'E'
 // CHECK-EDES-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
 // CHECK-EDES-NEXT: DefLocation:     
-// CHECK-EDES-NEXT:   LineNumber:      116
+// CHECK-EDES-NEXT:   LineNumber:      [[@LINE-10]]
 // CHECK-EDES-NEXT:   Filename:        '{{.*}}'
 // CHECK-EDES-NEXT: IsMethod:        true
 // CHECK-EDES-NEXT: Parent:          
@@ -144,7 +143,7 @@
 // CHECK-E-NEXT: USR:             '289584A8E0FF4178A794622A547AA622503967A1'
 // CHECK-E-NEXT: Name:            'E'
 // CHECK-E-NEXT: DefLocation:     
-// CHECK-E-NEXT:   LineNumber:      92
+// CHECK-E-NEXT:   LineNumber:      [[@LINE-55]]
 // CHECK-E-NEXT:   Filename:        '{{.*}}'
 // CHECK-E-NEXT: TagType:         Class
 // CHECK-E-NEXT: ...
@@ -159,10 +158,10 @@
 // CHECK-EPM-NEXT:     Name:            'E'
 // CHECK-EPM-NEXT:     USR:             '289584A8E0FF4178A794622A547AA622503967A1'
 // CHECK-EPM-NEXT: DefLocation:     
-// CHECK-EPM-NEXT:   LineNumber:      152
+// CHECK-EPM-NEXT:   LineNumber:      [[@LINE-10]]
 // CHECK-EPM-NEXT:   Filename:        '{{.*}}'
 // CHECK-EPM-NEXT: Location:        
-// CHECK-EPM-NEXT:   - LineNumber:      140
+// CHECK-EPM-NEXT:   - LineNumber:      [[@LINE-25]]
 // CHECK-EPM-NEXT:     Filename:        '{{.*}}'
 // CHECK-EPM-NEXT: IsMethod:        true
 // CHECK-EPM-NEXT: Parent:          
@@ -180,7 +179,7 @@
 // CHECK-F-NEXT: USR:             'E3B54702FABFF4037025BA194FC27C47006330B5'
 // CHECK-F-NEXT: Name:            'F'
 // CHECK-F-NEXT: DefLocation:     
-// CHECK-F-NEXT:   LineNumber:      177
+// CHECK-F-NEXT:   LineNumber:      [[@LINE-6]]
 // CHECK-F-NEXT:   Filename:        '{{.*}}'
 // CHECK-F-NEXT: TagType:         Class
 // CHECK-F-NEXT: Parents:         
@@ -204,7 +203,7 @@
 // CHECK-Y-NEXT:     Name:            'X'
 // CHECK-Y-NEXT:     USR:             'CA7C7935730B5EACD25F080E9C83FA087CCDC75E'
 // CHECK-Y-NEXT: DefLocation:     
-// CHECK-Y-NEXT:   LineNumber:      197
+// CHECK-Y-NEXT:   LineNumber:      [[@LINE-10]]
 // CHECK-Y-NEXT:   Filename:        '{{.*}}'
 // CHECK-Y-NEXT: TagType:         Class
 // CHECK-Y-NEXT: ...
@@ -215,34 +214,20 @@
 // CHECK-X-NEXT: USR:             'CA7C7935730B5EACD25F080E9C83FA087CCDC75E'
 // CHECK-X-NEXT: Name:            'X'
 // CHECK-X-NEXT: DefLocation:     
-// CHECK-X-NEXT:   LineNumber:      196
+// CHECK-X-NEXT:   LineNumber:      [[@LINE-22]]
 // CHECK-X-NEXT:   Filename:        '{{.*}}'
 // CHECK-X-NEXT: TagType:         Class
 // CHECK-X-NEXT: ...
 
 void H() {
   class I {};
-  
-// CHECK-I: ---
-// CHECK-I-NEXT: USR:             '{{.*}}'
-// CHECK-I-NEXT: Name:            'I'
-// CHECK-I-NEXT: Namespace:       
-// CHECK-I-NEXT:   - Type:            Function
-// CHECK-I-NEXT:     Name:            'H'
-// CHECK-I-NEXT:     USR:             'B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E'
-// CHECK-I-NEXT: DefLocation:     
-// CHECK-I-NEXT:   LineNumber:      224
-// CHECK-I-NEXT:   Filename:        'test'
-// CHECK-I-NEXT: TagType:         Class
-// CHECK-I-NEXT: ...
-
 }
 
 // CHECK-H: ---
 // CHECK-H-NEXT: USR:             'B6AC4C5C9F2EA3F2B3ECE1A33D349F4EE502B24E'
 // CHECK-H-NEXT: Name:            'H'
 // CHECK-H-NEXT: DefLocation:     
-// CHECK-H-NEXT:   LineNumber:      223
+// CHECK-H-NEXT:   LineNumber:      [[@LINE-8]]
 // CHECK-H-NEXT:   Filename:        'test'
 // CHECK-H-NEXT: ReturnType:      
 // CHECK-H-NEXT:   Type: