Properly print unnamed TagDecl objects in diagnostics

[aaron.ballman]

Summary

The diagnostics engine is very smart about being passed a NamedDecl to print as part of a diagnostic; it gets the "right" form of the name, quotes it properly, etc. However, the result of using an unnamed tag declaration was to print '' instead of anything useful.

This patch causes us to print the same information we'd have gotten if we had printed the type of the declaration rather than the name of it, as that's the most relevant information we can display.

[aaron.ballman]

clang/test/ExtractAPI/enum.c

3

This test's use of diff makes the diagnostic changes rather challenging. We can't diff the file path that's included when printing an unnamed object, because that path may be different from machine to machine. diff doesn't have any wildcard matching functionality to help here either. So we use sed to mutate the test file.. but the output uses the path of %t with escapes and we don't have a sed-compatible way to do that on Windows.

e.g., the output we want to match will contain F:\\users\\aballman\\desktop\\test.c on Windows but %t gives F:\users\aballman\desktop\test.c which sed turns into F:sers ballman esktop est.c or some other garbled form.

I'm hoping someone has a better way to approach this. I added %/et (for escaped %t) to get the behavior I needed, but I'd prefer not to modify lit for this.

[erichkeane]

LGTM!

clang/lib/AST/Decl.cpp

4481

Do we want to assert that this is either an EnumDecl, or a RecordDecl AND RD.isAnonymousStructOrUnion?

[aaron.ballman]

The clangd test failure found by precommit CI is stumping me as to how to resolve it. @sammccall -- can you help me out? The issue is that the test is expecting no name but now we're printing more information, but that information includes a file path which may differ between machines.

[aaron.ballman]

In D134813#3826991, @aaron.ballman wrote:

The clangd test failure found by precommit CI is stumping me as to how to resolve it. @sammccall -- can you help me out? The issue is that the test is expecting no name but now we're printing more information, but that information includes a file path which may differ between machines.

Ping @sammccall. FWIW, I found that the failing part of this test was change somewhat recently in https://github.com/llvm/llvm-project/commit/15f3cd6bfc670ba6106184a903eb04be059e5977 to add the markings to print the name of this class, so also pinging @mizvekov to see if this test coverage is necessary (another way to solve the issue is to stop trying to read the name of the unnamed class in the unit test).

[sammccall]

Sorry, Monday was a holiday here...

I don't think unconditionally including the filename in printQualifiedName() is great for tools, it can be unreasonably long and is generally just noise when shown in the context of that file. I'm surprised that USR generation + that clangd test are the only things that broke! Poor test coverage in the tools, I think :-(
If the intent is to change this for diagnostics only, can it be behind a PrintingPolicy flag?

The reason USR generation broke is it was deliberately testing/handling, see bool USRGenerator::EmitDeclName() in USRGeneration.cpp. (I'm not very familiar with the implementation, a bit more so with how its results are used). This isn't a good reason to keep the output as "" forever - we should probably change it to detect empty names explicitly instead.

clang/test/Index/usrs.m

121

This changes the semantics of the USRs: previously if an anonymous enum moved (e.g. because a file was edited) it retains its identity as long as the first enumerator keeps its name.

The equivalence classes of decls under USR mapping is important for some tools: I don't know all the ways Apple/XCode stuff uses it, but refactoring tools, clangd indexing etc will be affected by this.

(Occasional changes to the concrete USR values are manageable, basically we need to invalidate indexes that are otherwise usable across versions)

[aaron.ballman]

In D134813#3834496, @sammccall wrote:

Sorry, Monday was a holiday here...

No worries, I hope you had a good holiday!

I don't think unconditionally including the filename in printQualifiedName() is great for tools, it can be unreasonably long and is generally just noise when shown in the context of that file. I'm surprised that USR generation + that clangd test are the only things that broke! Poor test coverage in the tools, I think :-(
If the intent is to change this for diagnostics only, can it be behind a PrintingPolicy flag?

Diagnostics are largely the intent for this and I could probably put a printing policy flag, but I'm not yet convinced that printing nothing is actually better for tools in general. I think it really boils down to whether the name is user-facing or not. e.g., for USRs, it seems like we don't want to print this sort of thing, which is fine because users don't stare at those. But tools like clang-query output various names of things based on user queries, and it seems like it's less useful for that output to print nothing for the name.

That said, it still sounds like we should have a printing policy for it, but what should the default be? (I lean towards "print more information instead of less".)

The reason USR generation broke is it was deliberately testing/handling, see bool USRGenerator::EmitDeclName() in USRGeneration.cpp. (I'm not very familiar with the implementation, a bit more so with how its results are used). This isn't a good reason to keep the output as "" forever - we should probably change it to detect empty names explicitly instead.

Ah, thank you for the details!

clang/test/Index/usrs.m

121

Thank you for the extra set of eyes on this test, that's really good information!

[sammccall]

In D134813#3834540, @aaron.ballman wrote:

In D134813#3834496, @sammccall wrote:

Sorry, Monday was a holiday here...

No worries, I hope you had a good holiday!

Thanks :-)

I don't think unconditionally including the filename in printQualifiedName() is great for tools, it can be unreasonably long and is generally just noise when shown in the context of that file. I'm surprised that USR generation + that clangd test are the only things that broke! Poor test coverage in the tools, I think :-(
If the intent is to change this for diagnostics only, can it be behind a PrintingPolicy flag?

Diagnostics are largely the intent for this and I could probably put a printing policy flag, but I'm not yet convinced that printing nothing is actually better for tools in general.

Agreed - I think in my perfect world we'd switch between (unnammed struct) and (unnamed struct at ...).
... wait, we already have PrintingPolicy::AnonymousTagLocations, looks like that does what I want. I've set this for clangd in e212a4f838f17e2d37b1d572d8c1b49c50d7fe17, so this patch should be fine with just updating the string in the test to (unnamed class).

I think it really boils down to whether the name is user-facing or not. e.g., for USRs, it seems like we don't want to print this sort of thing, which is fine because users don't stare at those. But tools like clang-query output various names of things based on user queries, and it seems like it's less useful for that output to print nothing for the name.

Yeah, I can't see a case where silently printing *nothing* is clearly what we want.
Even USRs mostly don't do that: they try to print the name, detect nothing got printed, and print something else instead!

That said, it still sounds like we should have a printing policy for it, but what should the default be? (I lean towards "print more information instead of less".)

Given that we have a way to suppress the filename, I don't think we should add another printing policy (until we see a reason to).
Changing USR generation to not rely on this detail seems easier, I can take a stab at this.

[aaron.ballman]

In D134813#3834613, @sammccall wrote:

In D134813#3834540, @aaron.ballman wrote:

In D134813#3834496, @sammccall wrote:

Sorry, Monday was a holiday here...

No worries, I hope you had a good holiday!

Thanks :-)

I don't think unconditionally including the filename in printQualifiedName() is great for tools, it can be unreasonably long and is generally just noise when shown in the context of that file. I'm surprised that USR generation + that clangd test are the only things that broke! Poor test coverage in the tools, I think :-(
If the intent is to change this for diagnostics only, can it be behind a PrintingPolicy flag?

Diagnostics are largely the intent for this and I could probably put a printing policy flag, but I'm not yet convinced that printing nothing is actually better for tools in general.

Agreed - I think in my perfect world we'd switch between (unnammed struct) and (unnamed struct at ...).
... wait, we already have PrintingPolicy::AnonymousTagLocations, looks like that does what I want. I've set this for clangd in e212a4f838f17e2d37b1d572d8c1b49c50d7fe17, so this patch should be fine with just updating the string in the test to (unnamed class).

Hehe, I was getting a start on your idea when I discovered that as well. :-D

I think it really boils down to whether the name is user-facing or not. e.g., for USRs, it seems like we don't want to print this sort of thing, which is fine because users don't stare at those. But tools like clang-query output various names of things based on user queries, and it seems like it's less useful for that output to print nothing for the name.

Yeah, I can't see a case where silently printing *nothing* is clearly what we want.
Even USRs mostly don't do that: they try to print the name, detect nothing got printed, and print something else instead!

That said, it still sounds like we should have a printing policy for it, but what should the default be? (I lean towards "print more information instead of less".)

Given that we have a way to suppress the filename, I don't think we should add another printing policy (until we see a reason to).
Changing USR generation to not rely on this detail seems easier, I can take a stab at this.

Thank you, I think that's a good idea. I'll rebase on top of those changes.

[sammccall]

In D134813#3834613, @sammccall wrote:

Changing USR generation to not rely on this detail seems easier, I can take a stab at this.

Seems trivial: https://reviews.llvm.org/D135191
If there are still diffs in USR tests after rebasing on that, I'm happy to take a look at them.

[aaron.ballman]

In D134813#3834710, @sammccall wrote:

In D134813#3834613, @sammccall wrote:

Changing USR generation to not rely on this detail seems easier, I can take a stab at this.

Seems trivial: https://reviews.llvm.org/D135191
If there are still diffs in USR tests after rebasing on that, I'm happy to take a look at them.

Thank you for this! I applied D135191 over the top of my changes here and ran the tests to get all the new failures with the changes, then I reverted those tests which failed back to their trunk form. When I re-ran the tests, I get the following failures:

F:\source\llvm-project>python llvm\out\build\x64-Debug\bin\llvm-lit.py -sv -j61 clang\test\
llvm-lit.py: F:\source\llvm-project\llvm\utils\lit\lit\llvm\config.py:46: note: using lit tools: C:\GnuWin32\bin
llvm-lit.py: F:\source\llvm-project\llvm\utils\lit\lit\llvm\config.py:456: note: using clang: f:\source\llvm-project\llvm\out\build\x64-debug\bin\clang.exe
llvm-lit.py: F:\source\llvm-project\llvm\utils\lit\lit\discovery.py:247: warning: test suite 'Clang-Unit' contained no tests
-- Testing: 15539 tests, 61 workers --
Testing:
FAIL: Clang :: Index/usrs.m (1 of 15539)
******************** TEST 'Clang :: Index/usrs.m' FAILED ********************
Script:
--
: 'RUN: at line 103';   f:\source\llvm-project\llvm\out\build\x64-debug\bin\c-index-test.exe -test-load-source-usrs all -target x86_64-apple-macosx10.7 F:\source\llvm-project\clang\test\Index\usrs.m -isystem F:\source\llvm-project\clang\test\Index/Inputs | f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe F:\source\llvm-project\clang\test\Index\usrs.m
: 'RUN: at line 173';   f:\source\llvm-project\llvm\out\build\x64-debug\bin\c-index-test.exe -test-load-source all F:\source\llvm-project\clang\test\Index\usrs.m -isystem F:\source\llvm-project\clang\test\Index/Inputs | f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe -check-prefix=CHECK-source F:\source\llvm-project\clang\test\Index\usrs.m
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 103"
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\c-index-test.exe" "-test-load-source-usrs" "all" "-target" "x86_64-apple-macosx10.7" "F:\source\llvm-project\clang\test\Index\usrs.m" "-isystem" "F:\source\llvm-project\clang\test\Index/Inputs"
# command stderr:
F:\source\llvm-project\clang\test\Index\usrs.m:25:12: warning: class 'Foo' defined without specifying a base class [-Wobjc-root-class]
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:25:15: note: add a super class to fix this problem
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:51:12: warning: class 'CWithExt' defined without specifying a base class [-Wobjc-root-class]
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:51:20: note: add a super class to fix this problem
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:101:9: warning: 'MACRO3' macro redefined [-Wmacro-redefined]
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:100:9: note: previous definition is here
Number FIX-ITs = 0

$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe" "F:\source\llvm-project\clang\test\Index\usrs.m"
$ ":" "RUN: at line 173"
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\c-index-test.exe" "-test-load-source" "all" "F:\source\llvm-project\clang\test\Index\usrs.m" "-isystem" "F:\source\llvm-project\clang\test\Index/Inputs"
# command stderr:
F:\source\llvm-project\clang\test\Index\usrs.m:44:13: error: synthesized property 'd1' must either be named the same as a compatible instance variable or must explicitly name an instance variable
F:\source\llvm-project\clang\test\Index\usrs.m:25:12: warning: class 'Foo' defined without specifying a base class [-Wobjc-root-class]
F:\source\llvm-project\clang\test\Index\usrs.m:25:15: note: add a super class to fix this problem
F:\source\llvm-project\clang\test\Index\usrs.m:51:12: warning: class 'CWithExt' defined without specifying a base class [-Wobjc-root-class]
F:\source\llvm-project\clang\test\Index\usrs.m:51:20: note: add a super class to fix this problem
F:\source\llvm-project\clang\test\Index\usrs.m:86:6: error: instance variables may not be placed in class extension
F:\source\llvm-project\clang\test\Index\usrs.m:101:9: warning: 'MACRO3' macro redefined [-Wmacro-redefined]
F:\source\llvm-project\clang\test\Index\usrs.m:100:9: note: previous definition is here
F:\source\llvm-project\clang\test\Index\usrs.m:44:13: error: synthesized property 'd1' must either be named the same as a compatible instance variable or must explicitly name an instance variable
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:25:12: warning: class 'Foo' defined without specifying a base class [-Wobjc-root-class]
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:25:15: note: add a super class to fix this problem
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:51:12: warning: class 'CWithExt' defined without specifying a base class [-Wobjc-root-class]
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:51:20: note: add a super class to fix this problem
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:86:6: error: instance variables may not be placed in class extension
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:101:9: warning: 'MACRO3' macro redefined [-Wmacro-redefined]
Number FIX-ITs = 0
F:\source\llvm-project\clang\test\Index\usrs.m:100:9: note: previous definition is here
Number FIX-ITs = 0

$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe" "-check-prefix=CHECK-source" "F:\source\llvm-project\clang\test\Index\usrs.m"
# command stderr:
F:\source\llvm-project\clang\test\Index\usrs.m:188:18: error: CHECK-source: expected string not found in input
// CHECK-source: usrs.m:5:1: EnumDecl=:5:1 (Definition) Extent=[5:1 - 8:2]
                 ^
<stdin>:386:63: note: scanning from here
// CHECK: usrs.m:3:56: DeclRefExpr=y:3:40 Extent=[3:56 - 3:57]
                                                              ^
<stdin>:387:89: note: possible intended match here
// CHECK: usrs.m:5:1: EnumDecl=enum (unnamed at F:\source\llvm-project\clang\test\Index\usrs.m:5:1):5:1 (Definition) Extent=[5:1 - 8:2]
                                                                                        ^

Input file: <stdin>
Check file: F:\source\llvm-project\clang\test\Index\usrs.m

-dump-input=help explains the following input dump.

Input was:
<<<<<<
             .
             .
             .
           381: // CHECK: usrs.m:3:45: ReturnStmt= Extent=[3:45 - 3:57]
           382: // CHECK: usrs.m:3:52: BinaryOperator= Extent=[3:52 - 3:57]
           383: // CHECK: usrs.m:3:52: UnexposedExpr=x:3:33 Extent=[3:52 - 3:53]
           384: // CHECK: usrs.m:3:52: DeclRefExpr=x:3:33 Extent=[3:52 - 3:53]
           385: // CHECK: usrs.m:3:56: UnexposedExpr=y:3:40 Extent=[3:56 - 3:57]
           386: // CHECK: usrs.m:3:56: DeclRefExpr=y:3:40 Extent=[3:56 - 3:57]
check:188'0                                                                   X error: no match found
           387: // CHECK: usrs.m:5:1: EnumDecl=enum (unnamed at F:\source\llvm-project\clang\test\Index\usrs.m:5:1):5:1 (Definition) Extent=[5:1 - 8:2]
check:188'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:188'1                                                                                             ?                                                possible intended match
           388: // CHECK: usrs.m:6:3: EnumConstantDecl=ABA:6:3 (Definition) Extent=[6:3 - 6:6]
check:188'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           389: // CHECK: usrs.m:7:3: EnumConstantDecl=CADABA:7:3 (Definition) Extent=[7:3 - 7:9]
check:188'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           390: // CHECK: usrs.m:10:1: EnumDecl=enum (unnamed at F:\source\llvm-project\clang\test\Index\usrs.m:10:1):10:1 (Definition) Extent=[10:1 - 13:2]
check:188'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           391: // CHECK: usrs.m:11:3: EnumConstantDecl=FOO:11:3 (Definition) Extent=[11:3 - 11:6]
check:188'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           392: // CHECK: usrs.m:12:3: EnumConstantDecl=BAR:12:3 (Definition) Extent=[12:3 - 12:6]
check:188'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
             .
             .
             .
>>>>>>

error: command failed with exit status: 1

--

********************
Testing:
FAIL: Clang :: ExtractAPI/enum.c (3 of 15539)
******************** TEST 'Clang :: ExtractAPI/enum.c' FAILED ********************
Script:
--
: 'RUN: at line 1';   rm -rf F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp
: 'RUN: at line 2';   split-file F:\source\llvm-project\clang\test\ExtractAPI\enum.c F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp
: 'RUN: at line 3';   sed -e "s@INPUT_DIR@F:/source/llvm-project/llvm/out/build/x64-Debug/tools/clang/test/ExtractAPI/Output/enum.c.tmp@g"  F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json.in >> F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json
: 'RUN: at line 5';   f:\source\llvm-project\llvm\out\build\x64-debug\bin\clang.exe -cc1 -internal-isystem f:\source\llvm-project\llvm\out\build\x64-debug\lib\clang\16.0.0\include -nostdsysteminc -extract-api -triple arm64-apple-macosx    -x c-header F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/input.h -o F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output.json -verify
: 'RUN: at line 9';   sed -e "s@\"generator\": \".*\"@\"generator\": \"?\"@g"  F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output.json >> F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output-normalized.json
: 'RUN: at line 11';   diff F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output-normalized.json
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "rm" "-rf" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp"
$ ":" "RUN: at line 2"
$ "split-file" "F:\source\llvm-project\clang\test\ExtractAPI\enum.c" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp"
$ ":" "RUN: at line 3"
$ "sed" "-e" "s@INPUT_DIR@F:/source/llvm-project/llvm/out/build/x64-Debug/tools/clang/test/ExtractAPI/Output/enum.c.tmp@g" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json.in"
$ ":" "RUN: at line 5"
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\clang.exe" "-cc1" "-internal-isystem" "f:\source\llvm-project\llvm\out\build\x64-debug\lib\clang\16.0.0\include" "-nostdsysteminc" "-extract-api" "-triple" "arm64-apple-macosx" "-x" "c-header" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/input.h" "-o" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output.json" "-verify"
$ ":" "RUN: at line 9"
$ "sed" "-e" "s@"generator": ".*"@"generator": "?"@g" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output.json"
$ ":" "RUN: at line 11"
$ "diff" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output-normalized.json"
# command output:
*** F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json
--- F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output-normalized.json
***************
*** 655,667 ****
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "(anonymous)"
!           }
!         ],
!         "title": "(anonymous)"
!       },
!       "pathComponents": [
!         "(anonymous)"
        ]
      },
      {
--- 655,667 ----
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
!           }
!         ],
!         "title": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
!       },
!       "pathComponents": [
!         "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
        ]
      },
      {
***************
*** 703,709 ****
          "title": "Constant"
        },
        "pathComponents": [
!         "(anonymous)",
          "Constant"
        ]
      },
--- 703,709 ----
          "title": "Constant"
        },
        "pathComponents": [
!         "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)",
          "Constant"
        ]
      },
***************
*** 743,755 ****
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "(anonymous)"
!           }
!         ],
!         "title": "(anonymous)"
!       },
!       "pathComponents": [
!         "(anonymous)"
        ]
      },
      {
--- 743,755 ----
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:21:1)"
!           }
!         ],
!         "title": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:21:1)"
!       },
!       "pathComponents": [
!         "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:21:1)"
        ]
      },
      {
***************
*** 791,797 ****
          "title": "OtherConstant"
        },
        "pathComponents": [
!         "(anonymous)",
          "OtherConstant"
        ]
      }
--- 791,797 ----
          "title": "OtherConstant"
        },
        "pathComponents": [
!         "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:21:1)",
          "OtherConstant"
        ]
      }

error: command failed with exit status: 1

--

********************
Testing:
FAIL: Clang :: Index/annotate-comments-typedef.m (4 of 15539)
******************** TEST 'Clang :: Index/annotate-comments-typedef.m' FAILED ********************
Script:
--
: 'RUN: at line 1';   rm -rf F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp
: 'RUN: at line 2';   mkdir F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp
: 'RUN: at line 3';   f:\source\llvm-project\llvm\out\build\x64-debug\bin\c-index-test.exe -test-load-source all -comments-xml-schema=F:\source\llvm-project\clang\test\Index/../../bindings/xml/comment-xml-schema.rng F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m > F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp/out
: 'RUN: at line 4';   f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m < F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp/out
: 'RUN: at line 8';   f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m -check-prefix=WRONG < F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp/out
--
Exit Code: 1

Command Output (stdout):
--
$ ":" "RUN: at line 1"
$ "rm" "-rf" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp"
$ ":" "RUN: at line 2"
$ "mkdir" "F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\Index\Output\annotate-comments-typedef.m.tmp"
$ ":" "RUN: at line 3"
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\c-index-test.exe" "-test-load-source" "all" "-comments-xml-schema=F:\source\llvm-project\clang\test\Index/../../bindings/xml/comment-xml-schema.rng" "F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m"
$ ":" "RUN: at line 4"
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe" "F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m"
# command stderr:
F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m:39:11: error: CHECK: expected string not found in input
// CHECK: StructDecl=:[[@LINE-4]]:9 (Definition) {{.*}} BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Class file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-4]]" column="9"><Name>&lt;anonymous&gt;</Name><USR>c:@SA@Foo</USR><Declaration>struct {}</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Class>]
          ^
<stdin>:452:521: note: scanning from here
// CHECK: annotate-comments-typedef.m:37:11: TypedefDecl=Foo:37:11 (Definition) RawComment=[/** Comment about Foo */] RawCommentRange=[34:1 - 34:25] BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Typedef file="F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m" line="37" column="11"><Name>Foo</Name><USR>c:@T@Foo</USR><Declaration>typedef struct Foo Foo</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Typedef>]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ^
<stdin>:452:521: note: with "@LINE-4" equal to "35"
// CHECK: annotate-comments-typedef.m:37:11: TypedefDecl=Foo:37:11 (Definition) RawComment=[/** Comment about Foo */] RawCommentRange=[34:1 - 34:25] BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Typedef file="F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m" line="37" column="11"><Name>Foo</Name><USR>c:@T@Foo</USR><Declaration>typedef struct Foo Foo</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Typedef>]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ^
<stdin>:452:521: note: with "@LINE-4" equal to "35"
// CHECK: annotate-comments-typedef.m:37:11: TypedefDecl=Foo:37:11 (Definition) RawComment=[/** Comment about Foo */] RawCommentRange=[34:1 - 34:25] BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Typedef file="F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m" line="37" column="11"><Name>Foo</Name><USR>c:@T@Foo</USR><Declaration>typedef struct Foo Foo</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Typedef>]
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ^

Input file: <stdin>
Check file: F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            .
            .
            .
          447: // CHECK: CommentAST=[
          448: // CHECK: (CXComment_FullComment
          449: // CHECK: (CXComment_Paragraph
          450: // CHECK: (CXComment_Text Text=[ Comment about Foo ])))] Extent=[35:9 - 37:10]
          451: // CHECK: annotate-comments-typedef.m:36:14: FieldDecl=iii:36:14 (Definition) Extent=[36:10 - 36:17] [access=public]
          452: // CHECK: annotate-comments-typedef.m:37:11: TypedefDecl=Foo:37:11 (Definition) RawComment=[/** Comment about Foo */] RawCommentRange=[34:1 - 34:25] BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Typedef file="F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m" line="37" column="11"><Name>Foo</Name><USR>c:@T@Foo</USR><Declaration>typedef struct Foo Foo</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Typedef>]
check:39'0                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             X error: no match found
check:39'1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               with "@LINE-4" equal to "35"
check:39'2                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               with "@LINE-4" equal to "35"
          453: // CHECK: CommentAST=[
check:39'0     ~~~~~~~~~~~~~~~~~~~~~~~
          454: // CHECK: (CXComment_FullComment
check:39'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          455: // CHECK: (CXComment_Paragraph
check:39'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          456: // CHECK: (CXComment_Text Text=[ Comment about Foo ])))] Extent=[35:1 - 37:14]
check:39'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          457: // CHECK: annotate-comments-typedef.m:35:9: StructDecl=Foo:35:9 (Definition) RawComment=[/** Comment about Foo */] RawCommentRange=[34:1 - 34:25] BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Class file="F:\source\llvm-project\clang\test\Index\annotate-comments-typedef.m" line="35" column="9"><Name>&lt;anonymous&gt;</Name><USR>c:@SA@Foo</USR><Declaration>struct {}</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Class>]
check:39'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
            .
            .
            .
>>>>>>

error: command failed with exit status: 1

--

********************
Testing:  0.. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90..
********************
Failed Tests (3):
  Clang :: ExtractAPI/enum.c
  Clang :: Index/annotate-comments-typedef.m
  Clang :: Index/usrs.m


Testing Time: 379.02s
  Unsupported      :  1760
  Passed           : 13745
  Expectedly Failed:    31
  Failed           :     3

1 warning(s) in tests

and also the clangd unit tests failed:

[----------] 1 test from FindExplicitReferencesTest
[ RUN      ] FindExplicitReferencesTest.All
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.09 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187212 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
F:\source\llvm-project\clang-tools-extra\clangd\unittests\FindTargetTests.cpp(1924): error: Expected equality of these values:
  ExpectedRefs
    Which is: "0: targets = {}\n1: targets = {x}, decl\n2: targets = {fptr}, decl\n3: targets = {a}, decl\n"
  Actual.DumpedReferences
    Which is: "0: targets = {(unnamed)}\n1: targets = {x}, decl\n2: targets = {fptr}, decl\n3: targets = {a}, decl\n"
With diff:
@@ -1,3 +1,3 @@
-0: targets = {}
+0: targets = {(unnamed)}
 1: targets = {x}, decl
 2: targets = {fptr}, decl


             void foo() {
              $0^class {} $1^x;
              int (*$2^fptr)(int $3^a, int) = nullptr;
             }

Built preamble of size 187028 for file C:\clangd-test\TestTU.cpp version null in 0.09 seconds
Built preamble of size 187028 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187028 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.08 seconds
Built preamble of size 187024 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.06 seconds
Built preamble of size 187020 for file C:\clangd-test\TestTU.cpp version null in 0.07 seconds
[  FAILED  ] FindExplicitReferencesTest.All (19046 ms)
[----------] 1 test from FindExplicitReferencesTest (19048 ms total)

I'm testing on Windows, FWIW.

[sammccall]

In D134813#3834776, @aaron.ballman wrote:

Thank you for this! I applied D135191 over the top of my changes here and ran the tests to get all the new failures with the changes, then I reverted those tests which failed back to their trunk form. When I re-ran the tests, I get the following failures:

******************** TEST 'Clang :: Index/usrs.m' FAILED ********************
...
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe" "-check-prefix=CHECK-source" "F:\source\llvm-project\clang\test\Index\usrs.m"
# command stderr:
F:\source\llvm-project\clang\test\Index\usrs.m:188:18: error: CHECK-source: expected string not found in input
// CHECK-source: usrs.m:5:1: EnumDecl=:5:1 (Definition) Extent=[5:1 - 8:2]
                 ^
<stdin>:386:63: note: scanning from here
// CHECK: usrs.m:3:56: DeclRefExpr=y:3:40 Extent=[3:56 - 3:57]
                                                              ^
<stdin>:387:89: note: possible intended match here
// CHECK: usrs.m:5:1: EnumDecl=enum (unnamed at F:\source\llvm-project\clang\test\Index\usrs.m:5:1):5:1 (Definition) Extent=[5:1 - 8:2]

This isn't a change to USRs, it's a change to libclang's clang_getCursorSpelling. I think it's safe to update (unlike the USRs earlier in the file).
Since this is a general-purpose API it makes sense that it would follow the change in printName() defaults.

******************** TEST 'Clang :: ExtractAPI/enum.c' FAILED ********************
# command output:
*** F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json
--- F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output-normalized.json
***************
*** 655,667 ****
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "(anonymous)"
!           }
!         ],
!         "title": "(anonymous)"
!       },
!       "pathComponents": [
!         "(anonymous)"
        ]
      },
      {
--- 655,667 ----
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
!           }
!         ],
!         "title": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
!       },
!       "pathComponents": [
!         "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
        ]
      },
...

ExtractAPI seems to produce a data description of the AST for programmatic consumption (apple swift interop?), this looks like a breaking change to me.
It looks like they have at least one explicit check similar to USRs in clang/lib/ExtractAPI/ExtractAPIConsumer.cpp:361, but I know very little about how this tool is used out-of-tree by Apple: I'm not sure how much the exact strings/lack of strings matters, may need owners of that tool involved here.

******************** TEST 'Clang :: Index/annotate-comments-typedef.m' FAILED ********************

I can't see the actual output of the tool in that log, but I guess this is related to clang/lib/Index/CommentToXML.cpp:908.
I don't know if reporting exactly <anonymous> is important behavior that should be preserved, or (unnamed) would be fine. I don't even know what CommentToXML is: again I guess it's consumed by something related to XCode out-of-tree.

and also the clangd unit tests failed:

[----------] 1 test from FindExplicitReferencesTest
[ RUN      ] FindExplicitReferencesTest.All
...
With diff:
@@ -1,3 +1,3 @@
-0: targets = {}
+0: targets = {(unnamed)}
 1: targets = {x}, decl
 2: targets = {fptr}, decl


             void foo() {
              $0^class {} $1^x;
              int (*$2^fptr)(int $3^a, int) = nullptr;
             }

Yes, this is expected: the test identifies which target is referenced by name, and we changed the name from "" to "(unnamed)".
This patch can change the test data on clang-tools-extra/clangd/unittests/FindTargetTests.cpp:1619 from targets = {} to targets={(unnamed)}.

[aaron.ballman]

In D134813#3834938, @sammccall wrote:

In D134813#3834776, @aaron.ballman wrote:

Thank you for this! I applied D135191 over the top of my changes here and ran the tests to get all the new failures with the changes, then I reverted those tests which failed back to their trunk form. When I re-ran the tests, I get the following failures:

******************** TEST 'Clang :: Index/usrs.m' FAILED ********************
...
$ "f:\source\llvm-project\llvm\out\build\x64-debug\bin\filecheck.exe" "-check-prefix=CHECK-source" "F:\source\llvm-project\clang\test\Index\usrs.m"
# command stderr:
F:\source\llvm-project\clang\test\Index\usrs.m:188:18: error: CHECK-source: expected string not found in input
// CHECK-source: usrs.m:5:1: EnumDecl=:5:1 (Definition) Extent=[5:1 - 8:2]
                 ^
<stdin>:386:63: note: scanning from here
// CHECK: usrs.m:3:56: DeclRefExpr=y:3:40 Extent=[3:56 - 3:57]
                                                              ^
<stdin>:387:89: note: possible intended match here
// CHECK: usrs.m:5:1: EnumDecl=enum (unnamed at F:\source\llvm-project\clang\test\Index\usrs.m:5:1):5:1 (Definition) Extent=[5:1 - 8:2]

This isn't a change to USRs, it's a change to libclang's clang_getCursorSpelling. I think it's safe to update (unlike the USRs earlier in the file).
Since this is a general-purpose API it makes sense that it would follow the change in printName() defaults.

******************** TEST 'Clang :: ExtractAPI/enum.c' FAILED ********************
# command output:
*** F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/reference.output.json
--- F:\source\llvm-project\llvm\out\build\x64-Debug\tools\clang\test\ExtractAPI\Output\enum.c.tmp/output-normalized.json
***************
*** 655,667 ****
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "(anonymous)"
!           }
!         ],
!         "title": "(anonymous)"
!       },
!       "pathComponents": [
!         "(anonymous)"
        ]
      },
      {
--- 655,667 ----
          "navigator": [
            {
              "kind": "identifier",
!             "spelling": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
!           }
!         ],
!         "title": "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
!       },
!       "pathComponents": [
!         "enum (unnamed at F:\\source\\llvm-project\\llvm\\out\\build\\x64-Debug\\tools\\clang\\test\\ExtractAPI\\Output\\enum.c.tmp/input.h:17:1)"
        ]
      },
...

ExtractAPI seems to produce a data description of the AST for programmatic consumption (apple swift interop?), this looks like a breaking change to me.
It looks like they have at least one explicit check similar to USRs in clang/lib/ExtractAPI/ExtractAPIConsumer.cpp:361, but I know very little about how this tool is used out-of-tree by Apple: I'm not sure how much the exact strings/lack of strings matters, may need owners of that tool involved here.

******************** TEST 'Clang :: Index/annotate-comments-typedef.m' FAILED ********************

I can't see the actual output of the tool in that log, but I guess this is related to clang/lib/Index/CommentToXML.cpp:908.
I don't know if reporting exactly <anonymous> is important behavior that should be preserved, or (unnamed) would be fine. I don't even know what CommentToXML is: again I guess it's consumed by something related to XCode out-of-tree.

and also the clangd unit tests failed:

[----------] 1 test from FindExplicitReferencesTest
[ RUN      ] FindExplicitReferencesTest.All
...
With diff:
@@ -1,3 +1,3 @@
-0: targets = {}
+0: targets = {(unnamed)}
 1: targets = {x}, decl
 2: targets = {fptr}, decl


             void foo() {
              $0^class {} $1^x;
              int (*$2^fptr)(int $3^a, int) = nullptr;
             }

Yes, this is expected: the test identifies which target is referenced by name, and we changed the name from "" to "(unnamed)".
This patch can change the test data on clang-tools-extra/clangd/unittests/FindTargetTests.cpp:1619 from targets = {} to targets={(unnamed)}.

Thank you for the extra analysis! In terms of next steps, do you think I should roll your changes into this review and adjust the tests accordingly, or do you think we should land your changes first and then I rebase on top of them?

[sammccall]

I just landed that change to USR generation as 20c9ac29250493f5e0a3791dc1e5e9114ff0dc6e, so there should now be no USR changes (just some changes to debug representations that happen to be in some of the USR test files, which can be updated).

I'd guess we need some kind of change to CommentXML and ExtractAPI, but I don't know enough to be sure what it should be.

[aaron.ballman]

In D134813#3836826, @sammccall wrote:

I just landed that change to USR generation as 20c9ac29250493f5e0a3791dc1e5e9114ff0dc6e, so there should now be no USR changes (just some changes to debug representations that happen to be in some of the USR test files, which can be updated).

Thank you!

I'd guess we need some kind of change to CommentXML and ExtractAPI, but I don't know enough to be sure what it should be.

Ping @dang @zixuw and @dexonsmith for questions about how to handle ExtractAPI changes, and @gribozavr for questions about CommentXML

[zixuw]

In D134813#3836836, @aaron.ballman wrote:

I'd guess we need some kind of change to CommentXML and ExtractAPI, but I don't know enough to be sure what it should be.

Ping @dang @zixuw and @dexonsmith for questions about how to handle ExtractAPI changes, and @gribozavr for questions about CommentXML

Thanks for the heads up! Looking.

At a glance it seems that ExtractAPI would like to fall back to the original formats to not break downstream tooling. But not sure if it's fine because it's still consistent. As far as I can tell this only affects anonymous TagDecls. @QuietMisdreavus thoughts?

IMO we would still want to keep the ExtractAPI outputs unchanged if it's easy enough to do. We're using getName()/getQualifiedNameAsString() for names and index::generateUSRForDecl() for USRs. Is there a 'policy' or some alternatives to use? Or is the location info now part of the 'correct' format for USRs (seems a bit weird to see that as part of the USR)?

[zixuw]

clang/test/ExtractAPI/typedef_anonymous_record.c

74 ↗

(On Diff #463582)

Why is the A dropped here? Isn't this USR still referring to an anonymous struct (typedef struct { } MyStruct;)?

[zixuw]

Ah sorry I just finished reading the discussions. IIUC 20c9ac29250493f5e0a3791dc1e5e9114ff0dc6e should have already fixed the USR generation part, and all of the USR updates in the test cases should be gone now?

For the name part (title) I believe it's less likely to cause any problem, but would still be good to get rid of the location info just for the sake of keeping diff working and not having to change lit 🙃 (yeah probably using diff was not a good idea in the first place.. 😬)

[zixuw]

Setting PrintingPolicy::AnonymousTagLocations to false in https://reviews.llvm.org/D135295

[zixuw]

I'm pulling this on top of https://reviews.llvm.org/D135295 to try locally now.

clang/include/clang/AST/Decl.h

3659

nit: missing an override here. (warning: 'printName' overrides a member function but is not marked 'override' [-Winconsistent-missing-override])

[zixuw]

With the PrintingPolicy fix in https://reviews.llvm.org/D135295 and landed USR fix, the diff within ExtractAPI tests is only the wording with anonymous enums, and we can drop the lit change:

658c658
<             "spelling": "(anonymous)"
---
>             "spelling": "enum (unnamed)"
661c661
<         "title": "(anonymous)"
---
>         "title": "enum (unnamed)"
664c664
<         "(anonymous)"
---
>         "enum (unnamed)"
706c706
<         "(anonymous)",
---
>         "enum (unnamed)",
746c746
<             "spelling": "(anonymous)"
---
>             "spelling": "enum (unnamed)"
749c749
<         "title": "(anonymous)"
---
>         "title": "enum (unnamed)"
752c752
<         "(anonymous)"
---
>         "enum (unnamed)"
794c794
<         "(anonymous)",
---
>         "enum (unnamed)",

@dang @QuietMisdreavus for this change.

[dang]

In D134813#3838069, @zixuw wrote:

With the PrintingPolicy fix in https://reviews.llvm.org/D135295 and landed USR fix, the diff within ExtractAPI tests is only the wording with anonymous enums, and we can drop the lit change:

658c658
<             "spelling": "(anonymous)"
---
>             "spelling": "enum (unnamed)"
661c661
<         "title": "(anonymous)"
---
>         "title": "enum (unnamed)"
664c664
<         "(anonymous)"
---
>         "enum (unnamed)"
706c706
<         "(anonymous)",
---
>         "enum (unnamed)",
746c746
<             "spelling": "(anonymous)"
---
>             "spelling": "enum (unnamed)"
749c749
<         "title": "(anonymous)"
---
>         "title": "enum (unnamed)"
752c752
<         "(anonymous)"
---
>         "enum (unnamed)"
794c794
<         "(anonymous)",
---
>         "enum (unnamed)",

@dang @QuietMisdreavus for this change.

As far as I know this should affect downstream consumers like Swift-DocC. I am happy with these changes.

[aaron.ballman]

Rebased and updated based on review feedback.

[aaron.ballman]

Thank you *so much* to @sammccall @zixuw and @dang for the help with indexing and API extraction, I really appreciate it!

clang/include/clang/AST/Decl.h

3659

Good catch, thank you!

clang/lib/AST/Decl.cpp

4481

It's a reasonable suggestion, but I'd rather not because printing is used by the dump methods and dumping is often used from a debugger where things might be in a slightly weird state.

[aaron.ballman]

Updated to fix the clangd unit test breakage.

[aaron.ballman]

Fixes the failing AST unit test in Clang found by precommit CI.

[Hahnfeld]

Out of curiosity, not sure if it's worth fixing because it's easy enough to work around: I think after this change, it's not possible anymore to call printName(raw_ostream &OS) on a (statically typed) TagDecl / EnumDecl because it's hidden by TagDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) while it works perfectly for a NamedDecl. Is this intentional?

[aaron.ballman]

In D134813#4482674, @Hahnfeld wrote:

Out of curiosity, not sure if it's worth fixing because it's easy enough to work around: I think after this change, it's not possible anymore to call printName(raw_ostream &OS) on a (statically typed) TagDecl / EnumDecl because it's hidden by TagDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) while it works perfectly for a NamedDecl. Is this intentional?

That's not intentional, thank you for pointing it out! This should be corrected in 0566791ab28b5b842c3befea63d7d47fe9ba1a59

[Hahnfeld]

In D134813#4482808, @aaron.ballman wrote:

In D134813#4482674, @Hahnfeld wrote:

Out of curiosity, not sure if it's worth fixing because it's easy enough to work around: I think after this change, it's not possible anymore to call printName(raw_ostream &OS) on a (statically typed) TagDecl / EnumDecl because it's hidden by TagDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) while it works perfectly for a NamedDecl. Is this intentional?

That's not intentional, thank you for pointing it out! This should be corrected in 0566791ab28b5b842c3befea63d7d47fe9ba1a59

Thanks! Note that the same probably holds true (but I didn't test) for all other classes that override printName(raw_ostream &OS, const PrintingPolicy &Policy), ie DecompositionDecl, MSGuidDecl, UnnamedGlobalConstantDecl, and TemplateParamObjectDecl.

[aaron.ballman]

In D134813#4482819, @Hahnfeld wrote:

In D134813#4482808, @aaron.ballman wrote:

In D134813#4482674, @Hahnfeld wrote:

Out of curiosity, not sure if it's worth fixing because it's easy enough to work around: I think after this change, it's not possible anymore to call printName(raw_ostream &OS) on a (statically typed) TagDecl / EnumDecl because it's hidden by TagDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) while it works perfectly for a NamedDecl. Is this intentional?

That's not intentional, thank you for pointing it out! This should be corrected in 0566791ab28b5b842c3befea63d7d47fe9ba1a59

Thanks! Note that the same probably holds true (but I didn't test) for all other classes that override printName(raw_ostream &OS, const PrintingPolicy &Policy), ie DecompositionDecl, MSGuidDecl, UnnamedGlobalConstantDecl, and TemplateParamObjectDecl.

You're correct, but I figured those are somewhat uncommon AST nodes, so we can probably expose those APIs as-needed rather than doing all of them. However, if you prefer they all get handled, it's easy enough!

[Hahnfeld]

In D134813#4482822, @aaron.ballman wrote:

In D134813#4482819, @Hahnfeld wrote:

Thanks! Note that the same probably holds true (but I didn't test) for all other classes that override printName(raw_ostream &OS, const PrintingPolicy &Policy), ie DecompositionDecl, MSGuidDecl, UnnamedGlobalConstantDecl, and TemplateParamObjectDecl.

You're correct, but I figured those are somewhat uncommon AST nodes, so we can probably expose those APIs as-needed rather than doing all of them.

Oh, alright.

However, if you prefer they all get handled, it's easy enough!

No, not needed. I was only running into it with an EnumDecl while going to LLVM 16. But as I said, it's easy enough to work around.

[aaron.ballman]

In D134813#4482852, @Hahnfeld wrote:

In D134813#4482822, @aaron.ballman wrote:

In D134813#4482819, @Hahnfeld wrote:

Thanks! Note that the same probably holds true (but I didn't test) for all other classes that override printName(raw_ostream &OS, const PrintingPolicy &Policy), ie DecompositionDecl, MSGuidDecl, UnnamedGlobalConstantDecl, and TemplateParamObjectDecl.

You're correct, but I figured those are somewhat uncommon AST nodes, so we can probably expose those APIs as-needed rather than doing all of them.

Oh, alright.

However, if you prefer they all get handled, it's easy enough!

No, not needed. I was only running into it with an EnumDecl while going to LLVM 16. But as I said, it's easy enough to work around.

In general, I think we want to encourage callers to use the variant with a PrintingPolicy so that user-controlled options are properly handled (e.g., spelling it _Bool instead of bool older C modes, that sort of thing), so I figure the extra work is a subtle encouragement. :-)

clang-tools-extra/clangd/unittests/FindTargetTests.cpp

std::pair</*Code*/ llvm::StringRef, /*References*/ llvm::StringRef> Cases[] =
        // Anonymous entities should not be reported.
        {
            R"cpp(
              void foo() {
               $0^class {} $1^x;
               int (*$2^fptr)(int $3^a, int) = nullptr;
              }
            )cpp",
-           "0: targets = {}\n"
+           "0: targets = {(unnamed)}\n"
            "1: targets = {x}, decl\n"
            "2: targets = {fptr}, decl\n"
            "3: targets = {a}, decl\n"},
        // Namespace aliases should be handled properly.
        {
            R"cpp(
                 namespace ns { struct Type {}; }
                 namespace alias = ns;

clang/include/clang/AST/Decl.h

public:
   // FIXME: This function should be renamed to indicate that it is not just an
   // alternate form of getName(), and clients should move as appropriate.
   //
   // FIXME: Deprecated, move clients to getName().
   std::string getNameAsString() const { return Name.getAsString(); }
 
   /// Pretty-print the unqualified name of this declaration. Can be overloaded
   /// by derived classes to provide a more user-friendly name when appropriate.
-  virtual void printName(raw_ostream &os) const;
+  virtual void printName(raw_ostream &OS, const PrintingPolicy &Policy) const;
+  /// Calls printName() with the ASTContext printing policy from the decl.
+  void printName(raw_ostream &OS) const;
 
   /// Get the actual, stored name of the declaration, which may be a special
   /// name.
   ///
   /// Note that generally in diagnostics, the non-null \p NamedDecl* itself
   /// should be sent into the diagnostic instead of using the result of
   /// \p getDeclName().
   ///
unsigned getNumTemplateParameterLists() const {
     return hasExtInfo() ? getExtInfo()->NumTemplParamLists : 0;
   }
 
   TemplateParameterList *getTemplateParameterList(unsigned i) const {
     assert(i < getNumTemplateParameterLists());
     return getExtInfo()->TemplParamLists[i];
   }
 
+  void printName(raw_ostream &OS, const PrintingPolicy &Policy) const override;
+
   void setTemplateParameterListsInfo(ASTContext &Context,
                                      ArrayRef<TemplateParameterList *> TPLists);
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { return classofKind(D->getKind()); }
   static bool classofKind(Kind K) { return K >= firstTag && K <= lastTag; }
 
   static DeclContext *castToDeclContext(const TagDecl *D) {

clang/include/clang/AST/DeclCXX.h

static DecompositionDecl *Create(ASTContext &C, DeclContext *DC,
                                    ArrayRef<BindingDecl *> Bindings);
   static DecompositionDecl *CreateDeserialized(ASTContext &C, unsigned ID,
                                                unsigned NumBindings);
 
   ArrayRef<BindingDecl *> bindings() const {
     return llvm::makeArrayRef(getTrailingObjects<BindingDecl *>(), NumBindings);
   }
 
-  void printName(raw_ostream &os) const override;
+  void printName(raw_ostream &OS, const PrintingPolicy &Policy) const override;
 
   static bool classof(const Decl *D) { return classofKind(D->getKind()); }
   static bool classofKind(Kind K) { return K == Decomposition; }
 };
 
 /// An instance of this class represents the declaration of a property
 /// member.  This is a Microsoft extension to C++, first introduced in
 /// Visual Studio .NET 2003 as a parallel to similar features in C#
private:
 
   // Only ASTContext::getMSGuidDecl and deserialization create these.
   friend class ASTContext;
   friend class ASTReader;
   friend class ASTDeclReader;
 
 public:
   /// Print this UUID in a human-readable format.
-  void printName(llvm::raw_ostream &OS) const override;
+  void printName(llvm::raw_ostream &OS,
+                 const PrintingPolicy &Policy) const override;
 
   /// Get the decomposed parts of this declaration.
   Parts getParts() const { return PartVal; }
 
   /// Get the value of this MSGuidDecl as an APValue. This may fail and return
   /// an absent APValue if the type of the declaration is not of the expected
   /// shape.
   APValue &getAsAPValue() const;
class UnnamedGlobalConstantDecl : public ValueDecl,
   // Only ASTContext::getUnnamedGlobalConstantDecl and deserialization create
   // these.
   friend class ASTContext;
   friend class ASTReader;
   friend class ASTDeclReader;
 
 public:
   /// Print this in a human-readable format.
-  void printName(llvm::raw_ostream &OS) const override;
+  void printName(llvm::raw_ostream &OS,
+                 const PrintingPolicy &Policy) const override;
 
   const APValue &getValue() const { return Value; }
 
   static void Profile(llvm::FoldingSetNodeID &ID, QualType Ty,
                       const APValue &APVal) {
     Ty.Profile(ID);
     APVal.Profile(ID);
   }

clang/include/clang/AST/DeclTemplate.h

private:
   /// Only ASTContext::getTemplateParamObjectDecl and deserialization
   /// create these.
   friend class ASTContext;
   friend class ASTReader;
   friend class ASTDeclReader;
 
 public:
   /// Print this template parameter object in a human-readable format.
-  void printName(llvm::raw_ostream &OS) const override;
+  void printName(llvm::raw_ostream &OS,
+                 const PrintingPolicy &Policy) const override;
 
   /// Print this object as an equivalent expression.
   void printAsExpr(llvm::raw_ostream &OS) const;
   void printAsExpr(llvm::raw_ostream &OS, const PrintingPolicy &Policy) const;
 
   /// Print this object as an initializer suitable for a variable of the
   /// object's type.
   void printAsInit(llvm::raw_ostream &OS) const;

clang/lib/AST/ASTDiagnostic.cpp

if (VD) {
         OS << "&";
       else if (auto *TPO = dyn_cast<TemplateParamObjectDecl>(VD)) {
         // FIXME: Diffing the APValue would be neat.
         // FIXME: Suppress this and use the full name of the declaration if the
         // parameter is a pointer or reference.
         TPO->printAsInit(OS, Policy);
         return;
       }
-      VD->printName(OS);
+      VD->printName(OS, Policy);
       return;
     }
 
     if (NullPtr) {
       if (E && !isa<CXXNullPtrLiteralExpr>(E)) {
         PrintExpr(E);
         if (IsBold) {
           Unbold();

clang/lib/AST/Decl.cpp

case Module::PrivateModuleFragment:
     // The private module fragment is part of its containing module for linkage
     // purposes.
     return M->Parent;
   }
 
   llvm_unreachable("unknown module kind");
 }
 
-void NamedDecl::printName(raw_ostream &os) const {
-  os << Name;
+void NamedDecl::printName(raw_ostream &OS, const PrintingPolicy&) const {
+  OS << Name;
+}
+
+void NamedDecl::printName(raw_ostream &OS) const {
+  printName(OS, getASTContext().getPrintingPolicy());
 }
 
 std::string NamedDecl::getQualifiedNameAsString() const {
   std::string QualName;
   llvm::raw_string_ostream OS(QualName);
   printQualifiedName(OS, getASTContext().getPrintingPolicy());
   return QualName;
 }
 
 void NamedDecl::printQualifiedName(raw_ostream &OS) const {
   printQualifiedName(OS, getASTContext().getPrintingPolicy());
 }
 
 void NamedDecl::printQualifiedName(raw_ostream &OS,
                                    const PrintingPolicy &P) const {
   if (getDeclContext()->isFunctionOrMethod()) {
     // We do not print '(anonymous)' for function parameters without name.
-    printName(OS);
+    printName(OS, P);
     return;
   }
   printNestedNameSpecifier(OS, P);
   if (getDeclName())
     OS << *this;
   else {
     // Give the printName override a chance to pick a different name before we
     // fall back to "(anonymous)".
     SmallString<64> NameBuffer;
     llvm::raw_svector_ostream NameOS(NameBuffer);
-    printName(NameOS);
+    printName(NameOS, P);
     if (NameBuffer.empty())
       OS << "(anonymous)";
     else
       OS << NameBuffer;
   }
 }
 
 void NamedDecl::printNestedNameSpecifier(raw_ostream &OS) const {

 }
 
 void NamedDecl::getNameForDiagnostic(raw_ostream &OS,
                                      const PrintingPolicy &Policy,
                                      bool Qualified) const {
   if (Qualified)
     printQualifiedName(OS, Policy);
   else
-    printName(OS);
+    printName(OS, Policy);
 }
 
 template<typename T> static bool isRedeclarableImpl(Redeclarable<T> *) {
   return true;
 }
 static bool isRedeclarableImpl(...) { return false; }
 static bool isRedeclarable(Decl::Kind K) {
   switch (K) {
if (hasExtInfo()) {
         TypedefNameDeclOrQualifier = (TypedefNameDecl *)nullptr;
       }
       else
         getExtInfo()->QualifierLoc = QualifierLoc;
     }
   }
 }
 
+void TagDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) const {
+  DeclarationName Name = getDeclName();
+  // If the name is supposed to have an identifier but does not have one, then
+  // the tag is anonymous and we should print it differently.
+  if (Name.isIdentifier() && !Name.getAsIdentifierInfo()) {
+    // If the caller wanted to print a qualified name, they've already printed
+    // the scope. And if the caller doesn't want that, the scope information
+    // is already printed as part of the type.
+    PrintingPolicy Copy(Policy);
+    Copy.SuppressScope = true;
+    getASTContext().getTagDeclType(this).print(OS, Copy);
+    return;
+  }
+  // Otherwise, do the normal printing.
+  Name.print(OS, Policy);
+}
+
 void TagDecl::setTemplateParameterListsInfo(
     ASTContext &Context, ArrayRef<TemplateParameterList *> TPLists) {
   assert(!TPLists.empty());
   // Make sure the extended decl info is allocated.
   if (!hasExtInfo())
     // Allocate external info struct.
     TypedefNameDeclOrQualifier = new (getASTContext()) ExtInfo;
   // Set the template parameter lists info.

clang/lib/AST/DeclCXX.cpp

DecompositionDecl *DecompositionDecl::CreateDeserialized(ASTContext &C,
   // Set up and clean out the bindings array.
   Result->NumBindings = NumBindings;
   auto *Trail = Result->getTrailingObjects<BindingDecl *>();
   for (unsigned I = 0; I != NumBindings; ++I)
     new (Trail + I) BindingDecl*(nullptr);
   return Result;
 }
 
-void DecompositionDecl::printName(llvm::raw_ostream &os) const {
-  os << '[';
+void DecompositionDecl::printName(llvm::raw_ostream &OS,
+                                  const PrintingPolicy &Policy) const {
+  OS << '[';
   bool Comma = false;
   for (const auto *B : bindings()) {
     if (Comma)
-      os << ", ";
-    B->printName(os);
+      OS << ", ";
+    B->printName(OS, Policy);
     Comma = true;
   }
-  os << ']';
+  OS << ']';
 }
 
 void MSPropertyDecl::anchor() {}
 
 MSPropertyDecl *MSPropertyDecl::Create(ASTContext &C, DeclContext *DC,
                                        SourceLocation L, DeclarationName N,
                                        QualType T, TypeSourceInfo *TInfo,
                                        SourceLocation StartL,
MSGuidDecl *MSGuidDecl::Create(const ASTContext &C, QualType T, Parts P) {
   DeclContext *DC = C.getTranslationUnitDecl();
   return new (C, DC) MSGuidDecl(DC, T, P);
 }
 
 MSGuidDecl *MSGuidDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
   return new (C, ID) MSGuidDecl(nullptr, QualType(), Parts());
 }
 
-void MSGuidDecl::printName(llvm::raw_ostream &OS) const {
+void MSGuidDecl::printName(llvm::raw_ostream &OS,
+                           const PrintingPolicy &) const {
   OS << llvm::format("GUID{%08" PRIx32 "-%04" PRIx16 "-%04" PRIx16 "-",
                      PartVal.Part1, PartVal.Part2, PartVal.Part3);
   unsigned I = 0;
   for (uint8_t Byte : PartVal.Part4And5) {
     OS << llvm::format("%02" PRIx8, Byte);
     if (++I == 2)
       OS << '-';
   }

 }
 
 UnnamedGlobalConstantDecl *
 UnnamedGlobalConstantDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
   return new (C, ID)
       UnnamedGlobalConstantDecl(C, nullptr, QualType(), APValue());
 }
 
-void UnnamedGlobalConstantDecl::printName(llvm::raw_ostream &OS) const {
+void UnnamedGlobalConstantDecl::printName(llvm::raw_ostream &OS,
+                                          const PrintingPolicy &) const {
   OS << "unnamed-global-constant";
 }
 
 static const char *getAccessName(AccessSpecifier AS) {
   switch (AS) {
     case AS_none:
       llvm_unreachable("Invalid access specifier!");
     case AS_public:

clang/lib/AST/DeclPrinter.cpp

if (!D->isInvalidDecl()) {
     Out << "#pragma omp declare reduction (";
     if (D->getDeclName().getNameKind() == DeclarationName::CXXOperatorName) {
       const char *OpName =
           getOperatorSpelling(D->getDeclName().getCXXOverloadedOperator());
       assert(OpName && "not an overloaded operator");
       Out << OpName;
     } else {
       assert(D->getDeclName().isIdentifier());
-      D->printName(Out);
+      D->printName(Out, Policy);
     }
     Out << " : ";
     D->getType().print(Out, Policy);
     Out << " : ";
     D->getCombiner()->printPretty(Out, nullptr, Policy, 0, "\n", &Context);
     Out << ")";
     if (auto *Init = D->getInitializer()) {
       Out << " initializer(";
if (auto *Init = D->getInitializer()) {
       Out << ")";
     }
   }
 }
 
 void DeclPrinter::VisitOMPDeclareMapperDecl(OMPDeclareMapperDecl *D) {
   if (!D->isInvalidDecl()) {
     Out << "#pragma omp declare mapper (";
-    D->printName(Out);
+    D->printName(Out, Policy);
     Out << " : ";
     D->getType().print(Out, Policy);
     Out << " ";
     Out << D->getVarName();
     Out << ")";
     if (!D->clauselist_empty()) {
       OMPClausePrinter Printer(Out, Policy);
       for (auto *C : D->clauselists()) {

clang/lib/AST/DeclTemplate.cpp

 
 TemplateParamObjectDecl *
 TemplateParamObjectDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
   auto *TPOD = new (C, ID) TemplateParamObjectDecl(nullptr, QualType(), APValue());
   C.addDestruction(&TPOD->Value);
   return TPOD;
 }
 
-void TemplateParamObjectDecl::printName(llvm::raw_ostream &OS) const {
+void TemplateParamObjectDecl::printName(llvm::raw_ostream &OS,
+                                        const PrintingPolicy &Policy) const {
   OS << "<template param ";
-  printAsExpr(OS);
+  printAsExpr(OS, Policy);
   OS << ">";
 }
 
 void TemplateParamObjectDecl::printAsExpr(llvm::raw_ostream &OS) const {
   printAsExpr(OS, getASTContext().getPrintingPolicy());
 }
 
 void TemplateParamObjectDecl::printAsExpr(llvm::raw_ostream &OS,

clang/lib/AST/NestedNameSpecifier.cpp

case TypeSpecWithTemplate:
     // Fall through to print the type.
     [[fallthrough]];
 
   case TypeSpec: {
     const auto *Record =
             dyn_cast_or_null<ClassTemplateSpecializationDecl>(getAsRecordDecl());
     if (ResolveTemplateArguments && Record) {
         // Print the type trait with resolved template parameters.
-        Record->printName(OS);
+        Record->printName(OS, Policy);
         printTemplateArgumentList(
             OS, Record->getTemplateArgs().asArray(), Policy,
             Record->getSpecializedTemplate()->getTemplateParameters());
         break;
     }
     const Type *T = getAsType();
 
     PrintingPolicy InnerPolicy(Policy);

clang/lib/AST/TemplateName.cpp

void TemplateName::print(raw_ostream &OS, const PrintingPolicy &Policy,
   } else if (SubstTemplateTemplateParmPackStorage *SubstPack
                                         = getAsSubstTemplateTemplateParmPack())
     OS << *SubstPack->getParameterPack();
   else if (AssumedTemplateStorage *Assumed = getAsAssumedTemplateName()) {
     Assumed->getDeclName().print(OS, Policy);
   } else {
     assert(getKind() == TemplateName::OverloadedTemplate);
     OverloadedTemplateStorage *OTS = getAsOverloadedTemplate();
-    (*OTS->begin())->printName(OS);
+    (*OTS->begin())->printName(OS, Policy);
   }
 }
 
 const StreamingDiagnostic &clang::operator<<(const StreamingDiagnostic &DB,
                                              TemplateName N) {
   std::string NameStr;
   llvm::raw_string_ostream OS(NameStr);
   LangOptions LO;

clang/lib/CodeGen/CodeGenTypes.cpp

void CodeGenTypes::addRecordTypeName(const RecordDecl *RD,
   // Name the codegen type after the typedef name
   // if there is no tag type name available
   if (RD->getIdentifier()) {
     // FIXME: We should not have to check for a null decl context here.
     // Right now we do it because the implicit Obj-C decls don't have one.
     if (RD->getDeclContext())
       RD->printQualifiedName(OS, Policy);
     else
-      RD->printName(OS);
+      RD->printName(OS, Policy);
   } else if (const TypedefNameDecl *TDD = RD->getTypedefNameForAnonDecl()) {
     // FIXME: We should not have to check for a null decl context here.
     // Right now we do it because the implicit Obj-C decls don't have one.
     if (TDD->getDeclContext())
       TDD->printQualifiedName(OS, Policy);
     else
       TDD->printName(OS);
   } else

clang/lib/Sema/SemaTemplateInstantiate.cpp

case CodeSynthesisContext::TemplateInstantiation: {
       }
       break;
     }
 
     case CodeSynthesisContext::DefaultTemplateArgumentInstantiation: {
       TemplateDecl *Template = cast<TemplateDecl>(Active->Template);
       SmallString<128> TemplateArgsStr;
       llvm::raw_svector_ostream OS(TemplateArgsStr);
-      Template->printName(OS);
+      Template->printName(OS, getPrintingPolicy());
       printTemplateArgumentList(OS, Active->template_arguments(),
                                 getPrintingPolicy());
       Diags.Report(Active->PointOfInstantiation,
                    diag::note_default_arg_instantiation_here)
         << OS.str()
         << Active->InstantiationRange;
       break;
     }
for (SmallVectorImpl<CodeSynthesisContext>::reverse_iterator
     }
 
     case CodeSynthesisContext::DefaultFunctionArgumentInstantiation: {
       ParmVarDecl *Param = cast<ParmVarDecl>(Active->Entity);
       FunctionDecl *FD = cast<FunctionDecl>(Param->getDeclContext());
 
       SmallString<128> TemplateArgsStr;
       llvm::raw_svector_ostream OS(TemplateArgsStr);
-      FD->printName(OS);
+      FD->printName(OS, getPrintingPolicy());
       printTemplateArgumentList(OS, Active->template_arguments(),
                                 getPrintingPolicy());
       Diags.Report(Active->PointOfInstantiation,
                    diag::note_default_function_arg_instantiation_here)
         << OS.str()
         << Active->InstantiationRange;
       break;
     }
case CodeSynthesisContext::ConstraintsCheck: {
       else if (isa<ClassTemplatePartialSpecializationDecl>(Active->Entity))
         DiagID = diag::note_checking_constraints_for_class_spec_id_here;
       else {
         assert(isa<FunctionDecl>(Active->Entity));
         DiagID = diag::note_checking_constraints_for_function_here;
       }
       SmallString<128> TemplateArgsStr;
       llvm::raw_svector_ostream OS(TemplateArgsStr);
-      cast<NamedDecl>(Active->Entity)->printName(OS);
+      cast<NamedDecl>(Active->Entity)->printName(OS, getPrintingPolicy());
       if (!isa<FunctionDecl>(Active->Entity)) {
         printTemplateArgumentList(OS, Active->template_arguments(),
                                   getPrintingPolicy());
       }
       Diags.Report(Active->PointOfInstantiation, DiagID) << OS.str()
         << Active->InstantiationRange;
       break;
     }

clang/test/AST/ast-dump-record-definition-data-json.cpp

 // CHECK-NEXT:     "end": {
 // CHECK-NEXT:      "offset": {{[0-9]+}},
 // CHECK-NEXT:      "col": 29,
 // CHECK-NEXT:      "tokLen": 1
 // CHECK-NEXT:     }
 // CHECK-NEXT:    },
 // CHECK-NEXT:    "isImplicit": true,
 // CHECK-NEXT:    "isReferenced": true,
-// CHECK-NEXT:    "name": "~",
+// CHECK-NEXT:    "name": "~(lambda at {{.*}})",
 // CHECK-NEXT:    "mangledName": "_ZZ1fvEN3$_0D1Ev",
 // CHECK-NEXT:    "type": {
 // CHECK-NEXT:     "qualType": "void () noexcept"
 // CHECK-NEXT:    },
 // CHECK-NEXT:    "inline": true,
 // CHECK-NEXT:    "explicitlyDefaulted": "default"
 // CHECK-NEXT:   }
 // CHECK-NEXT:  ]

 // CHECK-NEXT:     "end": {
 // CHECK-NEXT:      "offset": {{[0-9]+}},
 // CHECK-NEXT:      "col": 26,
 // CHECK-NEXT:      "tokLen": 1
 // CHECK-NEXT:     }
 // CHECK-NEXT:    },
 // CHECK-NEXT:    "isImplicit": true,
 // CHECK-NEXT:    "isReferenced": true,
-// CHECK-NEXT:    "name": "~",
+// CHECK-NEXT:    "name": "~(lambda at {{.*}})",
 // CHECK-NEXT:    "mangledName": "_ZZ1fvEN3$_1D1Ev",
 // CHECK-NEXT:    "type": {
 // CHECK-NEXT:     "qualType": "void () noexcept"
 // CHECK-NEXT:    },
 // CHECK-NEXT:    "inline": true,
 // CHECK-NEXT:    "explicitlyDefaulted": "default"
 // CHECK-NEXT:   }
 // CHECK-NEXT:  ]

clang/test/ExtractAPI/enum.c

 // RUN: rm -rf %t
 // RUN: split-file %s %t
 // RUN: sed -e "s@INPUT_DIR@%{/t:regex_replacement}@g" \
 // RUN: %t/reference.output.json.in >> %t/reference.output.json
 // RUN: %clang_cc1 -extract-api -triple arm64-apple-macosx \
 // RUN:   -x c-header %t/input.h -o %t/output.json -verify
 
 // Generator version is not consistent across test runs, normalize it.
 // RUN: sed -e "s@\"generator\": \".*\"@\"generator\": \"?\"@g" \
 // RUN: %t/output.json >> %t/output-normalized.json
 // RUN: diff %t/reference.output.json %t/output-normalized.json
"symbols": [
           "line": 17
         },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "navigator": [
           {
             "kind": "identifier",
-            "spelling": "(anonymous)"
+            "spelling": "enum (unnamed)"
           }
         ],
-        "title": "(anonymous)"
+        "title": "enum (unnamed)"
       },
       "pathComponents": [
-        "(anonymous)"
+        "enum (unnamed)"
       ]
     },
     {
       "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "Constant"
"symbols": [
           {
             "kind": "identifier",
             "spelling": "Constant"
           }
         ],
         "title": "Constant"
       },
       "pathComponents": [
-        "(anonymous)",
+        "enum (unnamed)",
         "Constant"
       ]
     },
     {
       "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "keyword",
"symbols": [
           "line": 21
         },
         "uri": "file://INPUT_DIR/input.h"
       },
       "names": {
         "navigator": [
           {
             "kind": "identifier",
-            "spelling": "(anonymous)"
+            "spelling": "enum (unnamed)"
           }
         ],
-        "title": "(anonymous)"
+        "title": "enum (unnamed)"
       },
       "pathComponents": [
-        "(anonymous)"
+        "enum (unnamed)"
       ]
     },
     {
       "accessLevel": "public",
       "declarationFragments": [
         {
           "kind": "identifier",
           "spelling": "OtherConstant"
"symbols": [
           {
             "kind": "identifier",
             "spelling": "OtherConstant"
           }
         ],
         "title": "OtherConstant"
       },
       "pathComponents": [
-        "(anonymous)",
+        "enum (unnamed)",
         "OtherConstant"
       ]
     }
   ]
 }

clang/test/Index/annotate-comments-typedef.m

 // CHECK: TypedefDecl=E_T:[[@LINE-2]]:16 (Definition) FullCommentAsHTML=[<p class="para-brief"> Documentation for E </p>] FullCommentAsXML=[<Typedef file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-2]]" column="16"><Name>E</Name><USR>c:@E@E</USR><Declaration>typedef enum E E_T</Declaration><Abstract><Para> Documentation for E </Para></Abstract></Typedef>]
 
 
 /** Comment about Foo */
 typedef struct {
          int iii;
         } Foo;
 // CHECK: TypedefDecl=Foo:[[@LINE-1]]:11 (Definition) {{.*}} FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Typedef file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-1]]" column="11"><Name>Foo</Name><USR>c:@T@Foo</USR><Declaration>typedef struct Foo Foo</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Typedef>]
-// CHECK: StructDecl=:[[@LINE-4]]:9 (Definition) {{.*}} BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Class file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-4]]" column="9"><Name>&lt;anonymous&gt;</Name><USR>c:@SA@Foo</USR><Declaration>struct {}</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Class>]
+// CHECK: StructDecl=Foo:[[@LINE-4]]:9 (Definition) {{.*}} BriefComment=[Comment about Foo] FullCommentAsHTML=[<p class="para-brief"> Comment about Foo </p>] FullCommentAsXML=[<Class file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-4]]" column="9"><Name>&lt;anonymous&gt;</Name><USR>c:@SA@Foo</USR><Declaration>struct {}</Declaration><Abstract><Para> Comment about Foo </Para></Abstract></Class>]
 
 
 struct Foo1 {
   int iii;
 };
 /** About Foo1T */
 typedef struct Foo1 Foo1T;
 // FIXME: we don't attach this comment to 'struct Foo1'
 // CHECK: TypedefDecl=Foo1T:[[@LINE-2]]:21 (Definition) {{.*}} FullCommentAsHTML=[<p class="para-brief"> About Foo1T </p>] FullCommentAsXML=[<Typedef file="{{[^"]+}}annotate-comments-typedef.m" line="[[@LINE-2]]" column="21"><Name>Foo1T</Name><USR>c:annotate-comments-typedef.m@T@Foo1T</USR><Declaration>typedef struct Foo1 Foo1T</Declaration><Abstract><Para> About Foo1T </Para></Abstract></Typedef>]
 

clang/test/Index/c-index-api-loadTU-test.m

 // CHECK: c-index-api-loadTU-test.m:29:17: ObjCProtocolRef=Proto:25:11 Extent=[29:17 - 29:22]
 // CHECK: c-index-api-loadTU-test.m:30:3: ObjCInstanceMethodDecl=spMethod:30:3 Extent=[30:1 - 30:12]
 // CHECK: c-index-api-loadTU-test.m:33:12: ObjCInterfaceDecl=Baz:33:12 Extent=[33:1 - 40:5]
 // CHECK: c-index-api-loadTU-test.m:33:18: ObjCSuperClassRef=Bar:14:12 Extent=[33:18 - 33:21]
 // CHECK: c-index-api-loadTU-test.m:33:23: ObjCProtocolRef=SubP:29:11 Extent=[33:23 - 33:27]
 // CHECK: c-index-api-loadTU-test.m:35:9: ObjCIvarDecl=_anIVar:35:9 (Definition) Extent=[35:5 - 35:16]
 // CHECK: c-index-api-loadTU-test.m:38:11: ObjCInstanceMethodDecl=bazMethod:38:11 Extent=[38:1 - 38:21]
 // CHECK: c-index-api-loadTU-test.m:38:4: ObjCClassRef=Foo:4:12 Extent=[38:4 - 38:7]
-// CHECK: c-index-api-loadTU-test.m:42:1: EnumDecl=:42:1 (Definition) Extent=[42:1 - 44:2]
+// CHECK: c-index-api-loadTU-test.m:42:1: EnumDecl=enum (unnamed at {{.*}}):42:1 (Definition) Extent=[42:1 - 44:2]
 // CHECK: c-index-api-loadTU-test.m:43:3: EnumConstantDecl=someEnum:43:3 (Definition) Extent=[43:3 - 43:11]
 // CHECK: c-index-api-loadTU-test.m:46:5: FunctionDecl=main:46:5 (Definition) Extent=[46:1 - 55:2]
 // CHECK: c-index-api-loadTU-test.m:46:15: ParmDecl=argc:46:15 (Definition) Extent=[46:11 - 46:19]
 // CHECK: c-index-api-loadTU-test.m:46:34: ParmDecl=argv:46:34 (Definition) Extent=[46:21 - 46:40]
 // CHECK: c-index-api-loadTU-test.m:46:42: CompoundStmt= Extent=[46:42 - 55:2]
 // CHECK: c-index-api-loadTU-test.m:47:2: DeclStmt= Extent=[47:2 - 47:12]
 // CHECK: c-index-api-loadTU-test.m:47:8: VarDecl=bee:47:8 (Definition) Extent=[47:2 - 47:11]
 // CHECK: c-index-api-loadTU-test.m:47:2: ObjCClassRef=Baz:33:12 Extent=[47:2 - 47:5]

clang/test/Index/c-index-getCursor-test.m

 // CHECK: [31:27 - 33:5] ObjCInterfaceDecl=Baz:31:12
 // CHECK: [33:5 - 33:16] ObjCIvarDecl=_anIVar:33:9 (Definition)
 // CHECK: [33:16 - 36:1] ObjCInterfaceDecl=Baz:31:12
 // CHECK: [36:1 - 36:4] ObjCInstanceMethodDecl=bazMethod:36:1
 // CHECK: [36:4 - 36:7] ObjCClassRef=Foo:3:12
 // CHECK: [36:7 - 36:21] ObjCInstanceMethodDecl=bazMethod:36:1
 // CHECK: [36:21 - 38:5] ObjCInterfaceDecl=Baz:31:12
 // CHECK: [38:5 - 40:1] Invalid Cursor => NoDeclFound
-// CHECK: [40:1 - 41:3] EnumDecl=:40:1 (Definition)
+// CHECK: [40:1 - 41:3] EnumDecl=enum (unnamed at {{.*}}):40:1 (Definition)
 // CHECK: [41:3 - 41:11] EnumConstantDecl=someEnum:41:3 (Definition)
-// CHECK: [41:11 - 42:2] EnumDecl=:40:1 (Definition)
+// CHECK: [41:11 - 42:2] EnumDecl=enum (unnamed at {{.*}}):40:1 (Definition)
 // CHECK: [42:2 - 44:1] Invalid Cursor => NoDeclFound
 // CHECK: [44:1 - 44:11] FunctionDecl=main:44:5 (Definition)
 // CHECK: [44:11 - 44:19] ParmDecl=argc:44:15 (Definition)
 // CHECK: [44:19 - 44:21] FunctionDecl=main:44:5 (Definition)
 // CHECK: [44:21 - 44:40] ParmDecl=argv:44:34 (Definition)
 // CHECK: [44:40 - 44:42] FunctionDecl=main:44:5 (Definition)
 // CHECK: [44:42 - 45:2] CompoundStmt=
 // CHECK: [45:2 - 45:5] ObjCClassRef=Baz:31:12

clang/test/Index/print-type.c

 // CHECK: VarDecl=x:10:38 [type=__attribute__((__vector_size__(4 * sizeof(int)))) int] [typekind=Vector] [isPOD=1]
 // CHECK: TypedefDecl=int4_t:11:46 (Definition) [type=int4_t] [typekind=Typedef] [canonicaltype=__attribute__((__vector_size__(4 * sizeof(int)))) int] [canonicaltypekind=Vector] [isPOD=1]
 // CHECK: ParmDecl=incompletearray:13:12 (Definition) [type=int[]] [typekind=IncompleteArray] [isPOD=1]
 // CHECK: FunctionDecl=elaboratedEnumType:15:25 [type=enum Enum ()] [typekind=FunctionNoProto] [canonicaltype=enum Enum ()] [canonicaltypekind=FunctionNoProto] [resulttype=enum Enum] [resulttypekind=Elaborated] [isPOD=0]
 // CHECK: TypeRef=enum Enum:15:6 [type=enum Enum] [typekind=Enum] [isPOD=1]
 // CHECK: StructDecl=Struct:16:8 (Definition) [type=struct Struct] [typekind=Record] [isPOD=1]
 // CHECK: FunctionDecl=elaboratedStructType:16:32 [type=struct Struct ()] [typekind=FunctionNoProto] [canonicaltype=struct Struct ()] [canonicaltypekind=FunctionNoProto] [resulttype=struct Struct] [resulttypekind=Elaborated] [isPOD=0]
 // CHECK: TypeRef=struct Struct:16:8 [type=struct Struct] [typekind=Record] [isPOD=1]
-// CHECK: StructDecl=:18:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:18:1)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
-// CHECK: StructDecl=:23:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:23:1)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1] [isAnonRecDecl=0]
-// CHECK: StructDecl=:24:3 (Definition) [type=struct (anonymous at {{.*}}print-type.c:24:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=1]
+// CHECK: StructDecl=struct (unnamed at {{.*}}):18:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:18:1)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
+// CHECK: StructDecl=struct (unnamed at {{.*}}):23:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:23:1)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1] [isAnonRecDecl=0]
+// CHECK: StructDecl=struct (anonymous at {{.*}}):24:3 (Definition) [type=struct (anonymous at {{.*}}print-type.c:24:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=1]
 // CHECK: FieldDecl=x:25:17 (Definition) [type=_Atomic(int)] [typekind=Atomic] [valuetype=int] [valuetypekind=Int] [isPOD=0] [isAnonRecDecl=0]
 // CHECK: FieldDecl=y:26:9 (Definition) [type=int] [typekind=Int] [isPOD=1] [isAnonRecDecl=0]
-// CHECK: StructDecl=:30:10 (Definition) [type=struct (unnamed at {{.*}}print-type.c:30:10)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
+// CHECK: StructDecl=struct (unnamed at {{.*}}):30:10 (Definition) [type=struct (unnamed at {{.*}}print-type.c:30:10)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
 // CHECK: VarDecl=aul:32:24 [type=_Atomic(unsigned long)] [typekind=Atomic] [valuetype=unsigned long] [valuetypekind=ULong] [isPOD=0] [isAnonRecDecl=0]

clang/test/Index/print-type.cpp

 // CHECK: TemplateRef=Specialization:66:8 [type=] [typekind=Invalid] [isPOD=0]
 // CHECK: CallExpr=Specialization:66:8 [type=Specialization<Specialization<bool> &>] [typekind=Elaborated] [templateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [canonicaltype=Specialization<Specialization<bool> &>] [canonicaltypekind=Record] [canonicaltemplateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [isPOD=1]
 // CHECK: VarDecl=autoTemplRefParam:72:6 (Definition) [type=Specialization<Specialization<bool> &>] [typekind=Auto] [templateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [canonicaltype=Specialization<Specialization<bool> &>] [canonicaltypekind=Record] [canonicaltemplateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [isPOD=1]
 // CHECK: UnexposedExpr=templRefParam:71:40 [type=const Specialization<Specialization<bool> &>] [typekind=Record] const [templateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [isPOD=1]
 // CHECK: DeclRefExpr=templRefParam:71:40 [type=Specialization<Specialization<bool> &>] [typekind=Elaborated] [templateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [canonicaltype=Specialization<Specialization<bool> &>] [canonicaltypekind=Record] [canonicaltemplateargs/1= [type=Specialization<bool> &] [typekind=LValueReference]] [isPOD=1]
 // CHECK: TypeAliasDecl=baz:76:7 (Definition) [type=baz] [typekind=Typedef] [templateargs/1= [type=A<void>] [typekind=Elaborated]] [canonicaltype=A<void>] [canonicaltypekind=Record] [canonicaltemplateargs/1= [type=void] [typekind=Void]] [isPOD=0]
 // CHECK: VarDecl=autoTemplPointer:78:6 (Definition) [type=Specialization<Specialization<bool> &> *] [typekind=Auto] [canonicaltype=Specialization<Specialization<bool> &> *] [canonicaltypekind=Pointer] [isPOD=1] [pointeetype=Specialization<Specialization<bool> &>] [pointeekind=Auto]
 // CHECK: CallExpr=Bar:17:3 [type=outer::inner::Bar] [typekind=Elaborated] [canonicaltype=outer::inner::Bar] [canonicaltypekind=Record] [args= [outer::Foo<bool> *] [Pointer]] [isPOD=0] [nbFields=3]
-// CHECK: StructDecl=:84:3 (Definition) [type=X::(anonymous struct at {{.*}}print-type.cpp:84:3)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1]
-// CHECK: ClassDecl=:85:3 (Definition) [type=X::(anonymous class at {{.*}}print-type.cpp:85:3)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1]
-// CHECK: UnionDecl=:86:3 (Definition) [type=X::(anonymous union at {{.*}}print-type.cpp:86:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1]
-// CHECK: EnumDecl=:87:3 (Definition) [type=X::(unnamed enum at {{.*}}print-type.cpp:87:3)] [typekind=Enum] [isPOD=1] [isAnon=1]
+// CHECK: StructDecl=(anonymous struct at {{.*}}):84:3 (Definition) [type=X::(anonymous struct at {{.*}}print-type.cpp:84:3)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1]
+// CHECK: ClassDecl=(anonymous class at {{.*}}:85:3 (Definition) [type=X::(anonymous class at {{.*}}print-type.cpp:85:3)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1]
+// CHECK: UnionDecl=(anonymous union at {{.*}}:86:3 (Definition) [type=X::(anonymous union at {{.*}}print-type.cpp:86:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1]
+// CHECK: EnumDecl=(unnamed enum at {{.*}}:87:3 (Definition) [type=X::(unnamed enum at {{.*}}print-type.cpp:87:3)] [typekind=Enum] [isPOD=1] [isAnon=1]
 // CHECK: Namespace=:90:11 (Definition) [type=] [typekind=Invalid] [isPOD=0] [isAnon=1]
 // CHECK: Namespace=InlineNS:94:18 (Definition) [type=] [typekind=Invalid] [isPOD=0] [isAnonRecDecl=0] [isInlineNamespace=1]

clang/test/Index/targeted-annotation.c

 // RUN:   c-index-test -test-annotate-tokens=%S/targeted-fields.h:1:1:4:1 %s -include %t.h \
 // RUN:    -Xclang -error-on-deserialized-decl=PreambleVar  \
 // RUN:    -Xclang -error-on-deserialized-decl=NestedVar1  \
 // RUN:    -Xclang -error-on-deserialized-decl=TopVar  \
 // RUN:  | FileCheck %s -check-prefix=FIELD
 
 // FIELD: Keyword: "int" [2:3 - 2:6] FieldDecl=z:2:7 (Definition)
 // FIELD: Identifier: "z" [2:7 - 2:8] FieldDecl=z:2:7 (Definition)
-// FIELD: Punctuation: ";" [2:8 - 2:9] StructDecl=:13:9 (Definition)
+// FIELD: Punctuation: ";" [2:8 - 2:9] StructDecl=Vector:13:9 (Definition)
 // FIELD: Keyword: "int" [3:3 - 3:6] FieldDecl=w:3:7 (Definition)
 // FIELD: Identifier: "w" [3:7 - 3:8] FieldDecl=w:3:7 (Definition)
-// FIELD: Punctuation: ";" [3:8 - 3:9] StructDecl=:13:9 (Definition)
+// FIELD: Punctuation: ";" [3:8 - 3:9] StructDecl=Vector:13:9 (Definition)
 
 // RUN: env CINDEXTEST_FAILONERROR=1 c-index-test -test-annotate-tokens=%S/targeted-nested1.h:1:1:3:1 %s -include %t.h \
 // RUN:    -Xclang -error-on-deserialized-decl=TopVar  \
 // RUN:  | FileCheck %s -check-prefix=NESTED
 
 // RUN: env CINDEXTEST_FAILONERROR=1 CINDEXTEST_EDITING=1 CINDEXTEST_COMPLETION_NO_CACHING=1 \
 // RUN:   c-index-test -test-annotate-tokens=%S/targeted-nested1.h:1:1:3:1 %s -include %t.h \
 // RUN:    -Xclang -error-on-deserialized-decl=PreambleVar  \

 // TOP: Identifier: "ifndef" [2:2 - 2:8] preprocessing directive=
 // TOP: Identifier: "TARGETED_TOP_H" [2:9 - 2:23] preprocessing directive=
 // TOP: Punctuation: "#" [3:1 - 3:2] preprocessing directive=
 // TOP: Identifier: "define" [3:2 - 3:8] preprocessing directive=
 // TOP: Identifier: "TARGETED_TOP_H" [3:9 - 3:23] macro definition=TARGETED_TOP_H
 // TOP: Punctuation: "#" [5:1 - 5:2] inclusion directive=targeted-nested1.h
 // TOP: Identifier: "include" [5:2 - 5:9] inclusion directive=targeted-nested1.h
 // TOP: Literal: ""targeted-nested1.h"" [5:10 - 5:30] inclusion directive=targeted-nested1.h
-// TOP: Keyword: "enum" [7:1 - 7:5] EnumDecl=:7:1 (Definition)
-// TOP: Punctuation: "{" [7:6 - 7:7] EnumDecl=:7:1 (Definition)
+// TOP: Keyword: "enum" [7:1 - 7:5] EnumDecl=enum (unnamed at {{.*}}):7:1 (Definition)
+// TOP: Punctuation: "{" [7:6 - 7:7] EnumDecl=enum (unnamed at {{.*}}):7:1 (Definition)
 // TOP: Identifier: "VALUE" [8:3 - 8:8] EnumConstantDecl=VALUE:8:3 (Definition)
 // TOP: Punctuation: "=" [8:9 - 8:10] EnumConstantDecl=VALUE:8:3 (Definition)
 // TOP: Literal: "3" [8:11 - 8:12] IntegerLiteral=
-// TOP: Punctuation: "}" [9:1 - 9:2] EnumDecl=:7:1 (Definition)
+// TOP: Punctuation: "}" [9:1 - 9:2] EnumDecl=enum (unnamed at {{.*}}):7:1 (Definition)
 // TOP: Punctuation: ";" [9:2 - 9:3]
 // TOP: Keyword: "extern" [11:1 - 11:7]
 // TOP: Keyword: "int" [11:8 - 11:11] VarDecl=TopVar:11:12
 // TOP: Identifier: "TopVar" [11:12 - 11:18] VarDecl=TopVar:11:12
 // TOP: Punctuation: ";" [11:18 - 11:19]

clang/test/Index/targeted-cursor.c

 // RUN:  | FileCheck %s -check-prefix=PREAMBLE-CURSOR1
 
 // LOCAL-CURSOR1: VarDecl=LocalVar1:5:5
 // TOP-CURSOR1: VarDecl=TopVar:11:12
 // NESTED-CURSOR1: VarDecl=NestedVar1:2:12
 // PREAMBLE-CURSOR1: VarDecl=PreambleVar:2:12
 
 // FIELD-CURSOR1: FieldDecl=z:2:7 (Definition)
-// FIELD-CURSOR2: StructDecl=:13:9 (Definition)
+// FIELD-CURSOR2: StructDecl=Vector:13:9 (Definition)

clang/test/Index/usrs.m

 // CHECK: usrs.m c:@Ea@ABA Extent=[5:1 - 8:2]
 // CHECK: usrs.m c:@Ea@ABA@ABA Extent=[6:3 - 6:6]
 // CHECK: usrs.m c:@Ea@ABA@CADABA Extent=[7:3 - 7:9]
 // CHECK: usrs.m c:@Ea@FOO Extent=[10:1 - 13:2]
 // CHECK: usrs.m c:@Ea@FOO@FOO Extent=[11:3 - 11:6]
 // CHECK: usrs.m c:@Ea@FOO@BAR Extent=[12:3 - 12:6]
 // CHECK: usrs.m c:@SA@MyStruct Extent=[15:9 - 18:2]
 // CHECK: usrs.m c:@SA@MyStruct@FI@wa Extent=[16:3 - 16:9]
 // CHECK: usrs.m c:@SA@MyStruct@FI@moo Extent=[17:3 - 17:10]
 // CHECK: usrs.m c:@T@MyStruct Extent=[15:1 - 18:11]
 // CHECK: usrs.m c:@E@Pizza Extent=[20:1 - 23:2]
 // CHECK: usrs.m c:@E@Pizza@CHEESE Extent=[21:3 - 21:9]
 // CHECK: usrs.m c:@E@Pizza@MUSHROOMS Extent=[22:3 - 22:12]
 // CHECK: usrs.m c:objc(cs)Foo Extent=[25:1 - 32:5]
 // CHECK: usrs.m c:objc(cs)Foo@x Extent=[26:3 - 26:7]
 // CHECK: usrs.m c:objc(cs)Foo@y Extent=[27:3 - 27:7]
 // CHECK: usrs.m c:objc(cs)Foo(im)godzilla Extent=[29:1 - 29:17]

 // CHECK-source: usrs.m:3:19: FunctionDecl=my_helper:3:19 (Definition) Extent=[3:1 - 3:60]
 // CHECK-source: usrs.m:3:33: ParmDecl=x:3:33 (Definition) Extent=[3:29 - 3:34]
 // CHECK-source: usrs.m:3:40: ParmDecl=y:3:40 (Definition) Extent=[3:36 - 3:41]
 // CHECK-source: usrs.m:3:43: CompoundStmt= Extent=[3:43 - 3:60]
 // CHECK-source: usrs.m:3:45: ReturnStmt= Extent=[3:45 - 3:57]
 // CHECK-source: usrs.m:3:52: BinaryOperator= Extent=[3:52 - 3:57]
 // CHECK-source: usrs.m:3:52: DeclRefExpr=x:3:33 Extent=[3:52 - 3:53]
 // CHECK-source: usrs.m:3:56: DeclRefExpr=y:3:40 Extent=[3:56 - 3:57]
-// CHECK-source: usrs.m:5:1: EnumDecl=:5:1 (Definition) Extent=[5:1 - 8:2]
+// CHECK-source: usrs.m:5:1: EnumDecl=enum (unnamed at {{.*}}):5:1 (Definition) Extent=[5:1 - 8:2]
 // CHECK-source: usrs.m:6:3: EnumConstantDecl=ABA:6:3 (Definition) Extent=[6:3 - 6:6]
 // CHECK-source: usrs.m:7:3: EnumConstantDecl=CADABA:7:3 (Definition) Extent=[7:3 - 7:9]
-// CHECK-source: usrs.m:10:1: EnumDecl=:10:1 (Definition) Extent=[10:1 - 13:2]
+// CHECK-source: usrs.m:10:1: EnumDecl=enum (unnamed at {{.*}}):10:1 (Definition) Extent=[10:1 - 13:2]
 // CHECK-source: usrs.m:11:3: EnumConstantDecl=FOO:11:3 (Definition) Extent=[11:3 - 11:6]
 // CHECK-source: usrs.m:12:3: EnumConstantDecl=BAR:12:3 (Definition) Extent=[12:3 - 12:6]
 // CHECK-source: usrs.m:18:3: TypedefDecl=MyStruct:18:3 (Definition) Extent=[15:1 - 18:11]
-// CHECK-source: usrs.m:15:9: StructDecl=:15:9 (Definition) Extent=[15:9 - 18:2]
+// CHECK-source: usrs.m:15:9: StructDecl=MyStruct:15:9 (Definition) Extent=[15:9 - 18:2]
 // CHECK-source: usrs.m:16:7: FieldDecl=wa:16:7 (Definition) Extent=[16:3 - 16:9]
 // CHECK-source: usrs.m:17:7: FieldDecl=moo:17:7 (Definition) Extent=[17:3 - 17:10]
 // CHECK-source: usrs.m:20:6: EnumDecl=Pizza:20:6 (Definition) Extent=[20:1 - 23:2]
 // CHECK-source: usrs.m:21:3: EnumConstantDecl=CHEESE:21:3 (Definition) Extent=[21:3 - 21:9]
 // CHECK-source: usrs.m:22:3: EnumConstantDecl=MUSHROOMS:22:3 (Definition) Extent=[22:3 - 22:12]
 // CHECK-source: usrs.m:25:12: ObjCInterfaceDecl=Foo:25:12 Extent=[25:1 - 32:5]
 // CHECK-source: usrs.m:26:6: ObjCIvarDecl=x:26:6 (Definition) Extent=[26:3 - 26:7]
 // CHECK-source: usrs.m:26:3: TypeRef=id:0:0 Extent=[26:3 - 26:5]

clang/test/Sema/address-packed.c

 struct S4 {
   char c;
   struct __attribute__((packed)) {
     int i;
   } inner;
 };
 
 int *g4(struct S4 *s4) {
-  return &s4->inner.i; // expected-warning {{packed member 'i' of class or structure 'S4::(anonymous)'}}
+  return &s4->inner.i; // expected-warning {{packed member 'i' of class or structure 'S4::struct (unnamed at}}
 }
 
 struct S5 {
   char c;
   struct {
     char c1;
     int i __attribute__((packed));
   } inner;
 };
 
 int *g5(struct S5 *s5) {
-  return &s5->inner.i; // expected-warning {{packed member 'i' of class or structure 'S5::(anonymous)'}}
+  return &s5->inner.i; // expected-warning {{packed member 'i' of class or structure 'S5::struct (unnamed at}}
 }
 
 struct __attribute__((packed, aligned(2))) AlignedTo2 {
   int x;
 };
 
 char *g6(struct AlignedTo2 *s) {
   return (char *)&s->x; // no-warning

 struct S6 {
   union {
     char c;
     int x;
   } __attribute__((packed));
 };
 
 int *anonymousInnerUnion(struct S6 *s) {
-  return &s->x; // expected-warning {{packed member 'x' of class or structure 'S6::(anonymous)'}}
+  return &s->x; // expected-warning {{packed member 'x' of class or structure 'S6::union (anonymous at}}
 }
 
 struct S6a {
     int a;
     int _;
     int c;
     char __;
     int d;
 } __attribute__((packed, aligned(16))) s6;
 
 void g8(void)
-{ 
+{
     f1(&s6.a); // no-warning
     f1(&s6.c); // no-warning
     f1(&s6.d); // expected-warning {{packed member 'd' of class or structure 'S6a'}}
 }
 
 struct __attribute__((packed, aligned(1))) MisalignedContainee { double d; };
 struct __attribute__((aligned(8))) AlignedContainer { struct MisalignedContainee b; };
 

clang/test/Sema/attr-flag-enum.c

 // RUN: %clang_cc1 -triple %itanium_abi_triple -verify -fsyntax-only -std=c11 -Wassign-enum %s
 
 enum __attribute__((flag_enum)) flag {
   ea = 0x1,
   eb = 0x2,
   ec = 0x8,
 };
 
 enum __attribute__((flag_enum)) {
-  g = 0x7,  // expected-warning {{enumeration value 'g' is out of range of flags in enumeration type ''}}
+  g = 0x7,  // expected-warning {{enumeration value 'g' is out of range of flags in enumeration type 'enum (unnamed at}}
 };
 
 enum __attribute__((flag_enum)) flag2 {
   ga = 0x1,
   gb = 0x4,
 
   gc = 0x5, // no-warning
   gd = 0x7, // expected-warning {{enumeration value 'gd' is out of range}}

clang/test/SemaCXX/attr-unused.cpp

 // RUN: %clang_cc1 -verify -Wunused -Wused-but-marked-unused -fsyntax-only %s
 
 namespace ns_unused { typedef int Int_unused __attribute__((unused)); }
 namespace ns_not_unused { typedef int Int_not_unused; }
 
 template <typename T> class C;
 template <> class __attribute__((unused)) C<int> {};
 
 void f() {
   ns_not_unused::Int_not_unused i1; // expected-warning {{unused variable}}
   ns_unused::Int_unused i0; // expected-warning {{'Int_unused' was marked unused but was used}}
 
-  union __attribute__((unused)) { // expected-warning {{'' was marked unused but was used}}
+  union __attribute__((unused)) { // expected-warning {{was marked unused but was used}}
     int i;
   };
   (void) i;
 
   C<int>(); // expected-warning {{'C<int>' was marked unused but was used}}
 }

clang/test/SemaCXX/lambda-expressions.cpp

struct R {
     R(const R&) = default;
     R(R&&) = delete;
     R &operator=(const R&) = delete;
     R &operator=(R&&) = delete;
   };
   void g(P &p, Q &q, R &r) {
     // FIXME: The note attached to the second error here is just amazingly bad.
     auto pp = [p]{}; // expected-error {{deleted constructor}} expected-cxx14-error {{deleted copy constructor of '(lambda}}
-    // expected-cxx14-note@-1 {{copy constructor of '' is implicitly deleted because field '' has a deleted copy constructor}}
+    // expected-cxx14-note-re@-1 {{copy constructor of '(lambda at {{.*}})' is implicitly deleted because field '' has a deleted copy constructor}}
     auto qq = [q]{}; // expected-error {{deleted function}} expected-note {{because}}
 
     auto a = [r]{}; // expected-note 2{{here}}
     decltype(a) b = a;
     decltype(a) c = static_cast<decltype(a)&&>(a); // ok, copies R
     a = a; // expected-error {{copy assignment operator is implicitly deleted}}
     a = static_cast<decltype(a)&&>(a); // expected-error {{copy assignment operator is implicitly deleted}}
   }
#endif
   }
 }
 
 
 namespace lambdas_in_NSDMIs {
   template<class T>
   struct L {
       T t{};
-      T t2 = ([](int a) { return [](int b) { return b; };})(t)(t);    
+      T t2 = ([](int a) { return [](int b) { return b; };})(t)(t);
   };
-  L<int> l; 
-  
+  L<int> l;
   namespace non_template {
     struct L {
       int t = 0;
-      int t2 = ([](int a) { return [](int b) { return b; };})(t)(t);    
+      int t2 = ([](int a) { return [](int b) { return b; };})(t)(t);
     };
-    L l; 
+    L l;
   }
 }
 
 // PR18477: don't try to capture 'this' from an NSDMI encountered while parsing
 // a lambda.
 namespace NSDMIs_in_lambdas {
   template<typename T> struct S { int a = 0; int b = a; };
   void f() { []() { S<int> s; }; }

 }
 }
 
 namespace nested_lambda {
 template <int N>
 class S {};
 
 void foo() {
-  const int num = 18; 
+  const int num = 18;
   auto outer = []() {
-    auto inner = [](S<num> &X) {};  
+    auto inner = [](S<num> &X) {};
   };
 }
 }
 
 namespace PR27994 {
 struct A { template <class T> A(T); };
 
 template <class T>

 
 void foo1() {
   auto s0 = S1{[name=]() {}}; // expected-error 2 {{expected expression}}
   auto s1 = S1{[name=name]() {}}; // expected-error {{use of undeclared identifier 'name'; did you mean 'name1'?}}
 }
 }
 
 namespace PR25627_dont_odr_use_local_consts {
-  
   template<int> struct X {};
-  
   void foo() {
     const int N = 10;
     (void) [] { X<N> x; };
   }
 }
 
 namespace ConversionOperatorDoesNotHaveDeducedReturnType {
   auto x = [](int){};

clang/test/SemaCXX/ms-interface.cpp

 // RUN: %clang_cc1 %s -fsyntax-only -verify -fms-extensions -Wno-microsoft -std=c++11
 
 __interface I1 {
   // expected-error@+1 {{user-declared constructor is not permitted within an interface type}}
   I1();
   // expected-error@+1 {{user-declared destructor is not permitted within an interface type}}
   ~I1();
   virtual void fn1() const;
   // expected-error@+1 {{operator 'operator!' is not permitted within an interface type}}
   bool operator!();
   // expected-error@+1 {{operator 'operator int' is not permitted within an interface type}}
   operator int();
-  // expected-error@+1 {{nested class I1::(anonymous) is not permitted within an interface type}}
+  // expected-error-re@+1 {{nested class I1::(unnamed struct at {{.*}}) is not permitted within an interface type}}
   struct { int a; };
   void fn2() {
     struct A { }; // should be ignored: not a nested class
   }
 protected: // expected-error {{interface types cannot specify 'protected' access}}
   typedef void void_t;
   using int_t = int;
 private:   // expected-error {{interface types cannot specify 'private' access}}

clang/test/SemaObjCXX/arc-0x.mm

union U3 {
     U3 & operator=(const U3 &);
     U3 & operator=(U3 &&);
   };
 
   // ObjC pointer fields in anonymous union fields delete the defaulted special
   // functions of the containing class.
   struct S0 {
     union {
-      id f0; // expected-note 6 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
+      id f0; // expected-note-re 6 {{{{.*}} of '(anonymous union at {{.*}})' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
       char f1;
     };
   };
 
   struct S1 {
     union {
       union { // expected-note {{copy constructor of 'S1' is implicitly deleted because field '' has a deleted copy constructor}} expected-note {{copy assignment operator of 'S1' is implicitly deleted because field '' has a deleted copy assignment operator}} expected-note 4 {{'S1' is implicitly deleted because field '' has a deleted}}
-        id f0; // expected-note 2 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
+        id f0; // expected-note-re 2 {{{{.*}} of '(anonymous union at {{.*}}' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
         char f1;
       };
       int f2;
     };
   };
 
   struct S2 {
     union {
namespace test_union {
   U1 *x1;
   U2 *x2;
   U3 *x3;
   S0 *x4;
   S1 *x5;
   S2 *x6;
 
   static union { // expected-error {{call to implicitly-deleted default constructor of}}
-    id g0; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g0' is an ObjC pointer}}
+    id g0; // expected-note-re {{default constructor of '(unnamed union at {{.*}}' is implicitly deleted because variant field 'g0' is an ObjC pointer}}
   };
 
   static union { // expected-error {{call to implicitly-deleted default constructor of}}
-    union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}}
-      union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}}
-        __weak id g1; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g1' is an ObjC pointer}}
+    union { // expected-note-re {{default constructor of '(unnamed union at {{.*}}' is implicitly deleted because field '' has a deleted default constructor}}
+      union { // expected-note-re {{default constructor of '(anonymous union at {{.*}}' is implicitly deleted because field '' has a deleted default constructor}}
+        __weak id g1; // expected-note-re {{default constructor of '(anonymous union at {{.*}}' is implicitly deleted because variant field 'g1' is an ObjC pointer}}
         int g2;
       };
       int g3;
     };
     int g4;
   };
 
   void testDefaultConstructor() {

clang/test/Templight/templight-empty-entries-fix.cpp

 // RUN: %clang_cc1 -templight-dump -Wno-unused-value %s 2>&1 | FileCheck %s
 
 void a() {
   [] {};
 }
 
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+'lambda at .*templight-empty-entries-fix.cpp:4:3'$}}
+// CHECK: {{^name:[ ]+'\(lambda at .*templight-empty-entries-fix.cpp:4:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+Begin$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+'lambda at .*templight-empty-entries-fix.cpp:4:3'$}}
+// CHECK: {{^name:[ ]+'\(lambda at .*templight-empty-entries-fix.cpp:4:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+End$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
 
 template <int = 0> void a() { a(); }
 
 // CHECK-LABEL: {{^---$}}

 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:171:42'$}}
 
 void e() {
   struct {
   } f;
 }
 
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+unnamed struct$}}
+// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+Begin$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+unnamed struct$}}
+// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+End$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+unnamed struct$}}
+// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+Begin$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+unnamed struct$}}
+// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+End$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+unnamed struct$}}
+// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+Begin$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK-LABEL: {{^---$}}
-// CHECK: {{^name:[ ]+unnamed struct$}}
+// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
 // CHECK: {{^kind:[ ]+Memoization$}}
 // CHECK: {{^event:[ ]+End$}}
 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
 
 
 template <template<typename> class>
 void d();

clang/unittests/AST/ASTTraverserTest.cpp

 | | |-ParmVarDecl 'g'
 | | |-ParmVarDecl 'h'
 | | | `-IntegerLiteral
 | | `-CompoundStmt
 | |-FieldDecl ''
 | |-FieldDecl ''
 | |-FieldDecl ''
 | |-FieldDecl ''
-| `-CXXDestructorDecl '~'
+| `-CXXDestructorDecl '~(lambda at input.cc:9:3)'
 |-ImplicitCastExpr
 | `-DeclRefExpr 'a'
 |-DeclRefExpr 'b'
 |-ImplicitCastExpr
 | `-DeclRefExpr 'd'
 |-DeclRefExpr 'f'
 `-CompoundStmt
 )cpp";

llvm/utils/lit/lit/TestRunner.py

def getDefaultSubstitutions(test, tmpDir, tmpBase, normalize_slashes=False):
 
     # "%/[STpst]" should be normalized.
     substitutions.extend([
             ('%/s', sourcepath.replace('\\', '/')),
             ('%/S', sourcedir.replace('\\', '/')),
             ('%/p', sourcedir.replace('\\', '/')),
             ('%/t', tmpBase.replace('\\', '/') + '.tmp'),
             ('%/T', tmpDir.replace('\\', '/')),
+            ('%/et',tmpName.replace('\\', '\\\\\\\\\\\\\\\\')),
             ])
 
     # "%{/[STpst]:regex_replacement}" should be normalized like "%/[STpst]" but we're
     # also in a regex replacement context of a s@@@ regex.
     def regex_escape(s):
         s = s.replace('@', r'\@')
         s = s.replace('&', r'\&')
         return s