?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Bug 1797919 [wpt PR 36708] - Screen orientation: small bug fixes, a=testonly
[gecko.git] / build / build-clang / revert-llvmorg-16-init-7694-g19e984ef8f49.patch
blob09f3be74c46ca151ddeef4c85cc44cbaccce0f9e
1 Revert a change that breaks bindgen until things are sorted out.
2 https://github.com/rust-lang/rust-bindgen/issues/2312
3
4 ---
5 .../clangd/unittests/FindTargetTests.cpp | 2 +-
6 clang/include/clang/AST/Decl.h | 6 +---
7 clang/include/clang/AST/DeclCXX.h | 8 ++---
8 clang/include/clang/AST/DeclTemplate.h | 3 +-
9 clang/lib/AST/ASTDiagnostic.cpp | 2 +-
10 clang/lib/AST/Decl.cpp | 31 +++----------------
11 clang/lib/AST/DeclCXX.cpp | 17 +++++-----
12 clang/lib/AST/DeclPrinter.cpp | 4 +--
13 clang/lib/AST/DeclTemplate.cpp | 5 ++-
14 clang/lib/AST/NestedNameSpecifier.cpp | 2 +-
15 clang/lib/AST/TemplateName.cpp | 2 +-
16 clang/lib/CodeGen/CodeGenTypes.cpp | 2 +-
17 clang/lib/Sema/SemaTemplateInstantiate.cpp | 6 ++--
18 .../ast-dump-record-definition-data-json.cpp | 4 +--
19 clang/test/ExtractAPI/enum.c | 16 +++++-----
20 clang/test/Index/annotate-comments-typedef.m | 2 +-
21 clang/test/Index/c-index-api-loadTU-test.m | 2 +-
22 clang/test/Index/c-index-getCursor-test.m | 4 +--
23 clang/test/Index/print-type.c | 8 ++---
24 clang/test/Index/print-type.cpp | 8 ++---
25 clang/test/Index/targeted-annotation.c | 10 +++---
26 clang/test/Index/targeted-cursor.c | 2 +-
27 clang/test/Index/usrs.m | 6 ++--
28 clang/test/Sema/address-packed.c | 8 ++---
29 clang/test/Sema/attr-flag-enum.c | 2 +-
30 clang/test/SemaCXX/attr-unused.cpp | 2 +-
31 clang/test/SemaCXX/lambda-expressions.cpp | 20 ++++++------
32 clang/test/SemaCXX/ms-interface.cpp | 2 +-
33 clang/test/SemaObjCXX/arc-0x.mm | 12 +++----
34 .../Templight/templight-empty-entries-fix.cpp | 16 +++++-----
35 clang/unittests/AST/ASTTraverserTest.cpp | 2 +-
36 llvm/utils/lit/lit/TestRunner.py | 1 -
37 32 files changed, 92 insertions(+), 125 deletions(-)
38
39 diff --git a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp
40 index 336572aede2a..57838eafd651 100644
41 --- a/clang-tools-extra/clangd/unittests/FindTargetTests.cpp
42 +++ b/clang-tools-extra/clangd/unittests/FindTargetTests.cpp
43 @@ -1640,7 +1640,7 @@ TEST_F(FindExplicitReferencesTest, All) {
44 int (*$2^fptr)(int $3^a, int) = nullptr;
45 }
46 )cpp",
47 - "0: targets = {(unnamed)}\n"
48 + "0: targets = {}\n"
49 "1: targets = {x}, decl\n"
50 "2: targets = {fptr}, decl\n"
51 "3: targets = {a}, decl\n"},
52 diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
53 index 1e05d1e425a2..d566564ee7d0 100644
54 --- a/clang/include/clang/AST/Decl.h
55 +++ b/clang/include/clang/AST/Decl.h
56 @@ -291,9 +291,7 @@ public:
57
58 /// Pretty-print the unqualified name of this declaration. Can be overloaded
59 /// by derived classes to provide a more user-friendly name when appropriate.
60 - virtual void printName(raw_ostream &OS, const PrintingPolicy &Policy) const;
61 - /// Calls printName() with the ASTContext printing policy from the decl.
62 - void printName(raw_ostream &OS) const;
63 + virtual void printName(raw_ostream &os) const;
64
65 /// Get the actual, stored name of the declaration, which may be a special
66 /// name.
67 @@ -3656,8 +3654,6 @@ public:
68 return getExtInfo()->TemplParamLists[i];
69 }
70
71 - void printName(raw_ostream &OS, const PrintingPolicy &Policy) const override;
72 -
73 void setTemplateParameterListsInfo(ASTContext &Context,
74 ArrayRef<TemplateParameterList *> TPLists);
75
76 diff --git a/clang/include/clang/AST/DeclCXX.h b/clang/include/clang/AST/DeclCXX.h
77 index ce83424dd207..126d51133ac9 100644
78 --- a/clang/include/clang/AST/DeclCXX.h
79 +++ b/clang/include/clang/AST/DeclCXX.h
80 @@ -4100,7 +4100,7 @@ public:
81 return llvm::makeArrayRef(getTrailingObjects<BindingDecl *>(), NumBindings);
82 }
83
84 - void printName(raw_ostream &OS, const PrintingPolicy &Policy) const override;
85 + void printName(raw_ostream &os) const override;
86
87 static bool classof(const Decl *D) { return classofKind(D->getKind()); }
88 static bool classofKind(Kind K) { return K == Decomposition; }
89 @@ -4213,8 +4213,7 @@ private:
90
91 public:
92 /// Print this UUID in a human-readable format.
93 - void printName(llvm::raw_ostream &OS,
94 - const PrintingPolicy &Policy) const override;
95 + void printName(llvm::raw_ostream &OS) const override;
96
97 /// Get the decomposed parts of this declaration.
98 Parts getParts() const { return PartVal; }
99 @@ -4267,8 +4266,7 @@ class UnnamedGlobalConstantDecl : public ValueDecl,
100
101 public:
102 /// Print this in a human-readable format.
103 - void printName(llvm::raw_ostream &OS,
104 - const PrintingPolicy &Policy) const override;
105 + void printName(llvm::raw_ostream &OS) const override;
106
107 const APValue &getValue() const { return Value; }
108
109 diff --git a/clang/include/clang/AST/DeclTemplate.h b/clang/include/clang/AST/DeclTemplate.h
110 index 5cd1de4d2413..7d883f1922d7 100644
111 --- a/clang/include/clang/AST/DeclTemplate.h
112 +++ b/clang/include/clang/AST/DeclTemplate.h
113 @@ -3342,8 +3342,7 @@ private:
114
115 public:
116 /// Print this template parameter object in a human-readable format.
117 - void printName(llvm::raw_ostream &OS,
118 - const PrintingPolicy &Policy) const override;
119 + void printName(llvm::raw_ostream &OS) const override;
120
121 /// Print this object as an equivalent expression.
122 void printAsExpr(llvm::raw_ostream &OS) const;
123 diff --git a/clang/lib/AST/ASTDiagnostic.cpp b/clang/lib/AST/ASTDiagnostic.cpp
124 index 079fd268f4d3..079fc8bd1505 100644
125 --- a/clang/lib/AST/ASTDiagnostic.cpp
126 +++ b/clang/lib/AST/ASTDiagnostic.cpp
127 @@ -1893,7 +1893,7 @@ class TemplateDiff {
128 TPO->printAsInit(OS, Policy);
129 return;
130 }
131 - VD->printName(OS, Policy);
132 + VD->printName(OS);
133 return;
134 }
135
136 diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
137 index d1dd93b0a5b6..b326933b1d7d 100644
138 --- a/clang/lib/AST/Decl.cpp
139 +++ b/clang/lib/AST/Decl.cpp
140 @@ -1602,12 +1602,8 @@ Module *Decl::getOwningModuleForLinkage(bool IgnoreLinkage) const {
141 llvm_unreachable("unknown module kind");
142 }
143
144 -void NamedDecl::printName(raw_ostream &OS, const PrintingPolicy&) const {
145 - OS << Name;
146 -}
147 -
148 -void NamedDecl::printName(raw_ostream &OS) const {
149 - printName(OS, getASTContext().getPrintingPolicy());
150 +void NamedDecl::printName(raw_ostream &os) const {
151 + os << Name;
152 }
153
154 std::string NamedDecl::getQualifiedNameAsString() const {
155 @@ -1625,7 +1621,7 @@ void NamedDecl::printQualifiedName(raw_ostream &OS,
156 const PrintingPolicy &P) const {
157 if (getDeclContext()->isFunctionOrMethod()) {
158 // We do not print '(anonymous)' for function parameters without name.
159 - printName(OS, P);
160 + printName(OS);
161 return;
162 }
163 printNestedNameSpecifier(OS, P);
164 @@ -1636,7 +1632,7 @@ void NamedDecl::printQualifiedName(raw_ostream &OS,
165 // fall back to "(anonymous)".
166 SmallString<64> NameBuffer;
167 llvm::raw_svector_ostream NameOS(NameBuffer);
168 - printName(NameOS, P);
169 + printName(NameOS);
170 if (NameBuffer.empty())
171 OS << "(anonymous)";
172 else
173 @@ -1759,7 +1755,7 @@ void NamedDecl::getNameForDiagnostic(raw_ostream &OS,
174 if (Qualified)
175 printQualifiedName(OS, Policy);
176 else
177 - printName(OS, Policy);
178 + printName(OS);
179 }
180
181 template<typename T> static bool isRedeclarableImpl(Redeclarable<T> *) {
182 @@ -4474,23 +4470,6 @@ void TagDecl::setQualifierInfo(NestedNameSpecifierLoc QualifierLoc) {
183 }
184 }
185
186 -void TagDecl::printName(raw_ostream &OS, const PrintingPolicy &Policy) const {
187 - DeclarationName Name = getDeclName();
188 - // If the name is supposed to have an identifier but does not have one, then
189 - // the tag is anonymous and we should print it differently.
190 - if (Name.isIdentifier() && !Name.getAsIdentifierInfo()) {
191 - // If the caller wanted to print a qualified name, they've already printed
192 - // the scope. And if the caller doesn't want that, the scope information
193 - // is already printed as part of the type.
194 - PrintingPolicy Copy(Policy);
195 - Copy.SuppressScope = true;
196 - getASTContext().getTagDeclType(this).print(OS, Copy);
197 - return;
198 - }
199 - // Otherwise, do the normal printing.
200 - Name.print(OS, Policy);
201 -}
202 -
203 void TagDecl::setTemplateParameterListsInfo(
204 ASTContext &Context, ArrayRef<TemplateParameterList *> TPLists) {
205 assert(!TPLists.empty());
206 diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
207 index b92210996fdb..40a7ae80b61a 100644
208 --- a/clang/lib/AST/DeclCXX.cpp
209 +++ b/clang/lib/AST/DeclCXX.cpp
210 @@ -3269,17 +3269,16 @@ DecompositionDecl *DecompositionDecl::CreateDeserialized(ASTContext &C,
211 return Result;
212 }
213
214 -void DecompositionDecl::printName(llvm::raw_ostream &OS,
215 - const PrintingPolicy &Policy) const {
216 - OS << '[';
217 +void DecompositionDecl::printName(llvm::raw_ostream &os) const {
218 + os << '[';
219 bool Comma = false;
220 for (const auto *B : bindings()) {
221 if (Comma)
222 - OS << ", ";
223 - B->printName(OS, Policy);
224 + os << ", ";
225 + B->printName(os);
226 Comma = true;
227 }
228 - OS << ']';
229 + os << ']';
230 }
231
232 void MSPropertyDecl::anchor() {}
233 @@ -3315,8 +3314,7 @@ MSGuidDecl *MSGuidDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
234 return new (C, ID) MSGuidDecl(nullptr, QualType(), Parts());
235 }
236
237 -void MSGuidDecl::printName(llvm::raw_ostream &OS,
238 - const PrintingPolicy &) const {
239 +void MSGuidDecl::printName(llvm::raw_ostream &OS) const {
240 OS << llvm::format("GUID{%08" PRIx32 "-%04" PRIx16 "-%04" PRIx16 "-",
241 PartVal.Part1, PartVal.Part2, PartVal.Part3);
242 unsigned I = 0;
243 @@ -3425,8 +3423,7 @@ UnnamedGlobalConstantDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
244 UnnamedGlobalConstantDecl(C, nullptr, QualType(), APValue());
245 }
246
247 -void UnnamedGlobalConstantDecl::printName(llvm::raw_ostream &OS,
248 - const PrintingPolicy &) const {
249 +void UnnamedGlobalConstantDecl::printName(llvm::raw_ostream &OS) const {
250 OS << "unnamed-global-constant";
251 }
252
253 diff --git a/clang/lib/AST/DeclPrinter.cpp b/clang/lib/AST/DeclPrinter.cpp
254 index 0071f9b00137..ad90e536c0de 100644
255 --- a/clang/lib/AST/DeclPrinter.cpp
256 +++ b/clang/lib/AST/DeclPrinter.cpp
257 @@ -1711,7 +1711,7 @@ void DeclPrinter::VisitOMPDeclareReductionDecl(OMPDeclareReductionDecl *D) {
258 Out << OpName;
259 } else {
260 assert(D->getDeclName().isIdentifier());
261 - D->printName(Out, Policy);
262 + D->printName(Out);
263 }
264 Out << " : ";
265 D->getType().print(Out, Policy);
266 @@ -1741,7 +1741,7 @@ void DeclPrinter::VisitOMPDeclareReductionDecl(OMPDeclareReductionDecl *D) {
267 void DeclPrinter::VisitOMPDeclareMapperDecl(OMPDeclareMapperDecl *D) {
268 if (!D->isInvalidDecl()) {
269 Out << "#pragma omp declare mapper (";
270 - D->printName(Out, Policy);
271 + D->printName(Out);
272 Out << " : ";
273 D->getType().print(Out, Policy);
274 Out << " ";
275 diff --git a/clang/lib/AST/DeclTemplate.cpp b/clang/lib/AST/DeclTemplate.cpp
276 index c419cb7006b5..15092541b8f1 100644
277 --- a/clang/lib/AST/DeclTemplate.cpp
278 +++ b/clang/lib/AST/DeclTemplate.cpp
279 @@ -1532,10 +1532,9 @@ TemplateParamObjectDecl::CreateDeserialized(ASTContext &C, unsigned ID) {
280 return TPOD;
281 }
282
283 -void TemplateParamObjectDecl::printName(llvm::raw_ostream &OS,
284 - const PrintingPolicy &Policy) const {
285 +void TemplateParamObjectDecl::printName(llvm::raw_ostream &OS) const {
286 OS << "<template param ";
287 - printAsExpr(OS, Policy);
288 + printAsExpr(OS);
289 OS << ">";
290 }
291
292 diff --git a/clang/lib/AST/NestedNameSpecifier.cpp b/clang/lib/AST/NestedNameSpecifier.cpp
293 index 36f2c47b3000..ab656fd9ddf6 100644
294 --- a/clang/lib/AST/NestedNameSpecifier.cpp
295 +++ b/clang/lib/AST/NestedNameSpecifier.cpp
296 @@ -287,7 +287,7 @@ void NestedNameSpecifier::print(raw_ostream &OS, const PrintingPolicy &Policy,
297 dyn_cast_or_null<ClassTemplateSpecializationDecl>(getAsRecordDecl());
298 if (ResolveTemplateArguments && Record) {
299 // Print the type trait with resolved template parameters.
300 - Record->printName(OS, Policy);
301 + Record->printName(OS);
302 printTemplateArgumentList(
303 OS, Record->getTemplateArgs().asArray(), Policy,
304 Record->getSpecializedTemplate()->getTemplateParameters());
305 diff --git a/clang/lib/AST/TemplateName.cpp b/clang/lib/AST/TemplateName.cpp
306 index f301133eef80..88ab7b8f34a5 100644
307 --- a/clang/lib/AST/TemplateName.cpp
308 +++ b/clang/lib/AST/TemplateName.cpp
309 @@ -322,7 +322,7 @@ void TemplateName::print(raw_ostream &OS, const PrintingPolicy &Policy,
310 } else {
311 assert(getKind() == TemplateName::OverloadedTemplate);
312 OverloadedTemplateStorage *OTS = getAsOverloadedTemplate();
313 - (*OTS->begin())->printName(OS, Policy);
314 + (*OTS->begin())->printName(OS);
315 }
316 }
317
318 diff --git a/clang/lib/CodeGen/CodeGenTypes.cpp b/clang/lib/CodeGen/CodeGenTypes.cpp
319 index 05956c2c1ec6..fcce424747f1 100644
320 --- a/clang/lib/CodeGen/CodeGenTypes.cpp
321 +++ b/clang/lib/CodeGen/CodeGenTypes.cpp
322 @@ -67,7 +67,7 @@ void CodeGenTypes::addRecordTypeName(const RecordDecl *RD,
323 if (RD->getDeclContext())
324 RD->printQualifiedName(OS, Policy);
325 else
326 - RD->printName(OS, Policy);
327 + RD->printName(OS);
328 } else if (const TypedefNameDecl *TDD = RD->getTypedefNameForAnonDecl()) {
329 // FIXME: We should not have to check for a null decl context here.
330 // Right now we do it because the implicit Obj-C decls don't have one.
331 diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp
332 index 1400693f664e..00d3e185c10f 100644
333 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp
334 +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp
335 @@ -723,7 +723,7 @@ void Sema::PrintInstantiationStack() {
336 TemplateDecl *Template = cast<TemplateDecl>(Active->Template);
337 SmallString<128> TemplateArgsStr;
338 llvm::raw_svector_ostream OS(TemplateArgsStr);
339 - Template->printName(OS, getPrintingPolicy());
340 + Template->printName(OS);
341 printTemplateArgumentList(OS, Active->template_arguments(),
342 getPrintingPolicy());
343 Diags.Report(Active->PointOfInstantiation,
344 @@ -789,7 +789,7 @@ void Sema::PrintInstantiationStack() {
345
346 SmallString<128> TemplateArgsStr;
347 llvm::raw_svector_ostream OS(TemplateArgsStr);
348 - FD->printName(OS, getPrintingPolicy());
349 + FD->printName(OS);
350 printTemplateArgumentList(OS, Active->template_arguments(),
351 getPrintingPolicy());
352 Diags.Report(Active->PointOfInstantiation,
353 @@ -954,7 +954,7 @@ void Sema::PrintInstantiationStack() {
354 }
355 SmallString<128> TemplateArgsStr;
356 llvm::raw_svector_ostream OS(TemplateArgsStr);
357 - cast<NamedDecl>(Active->Entity)->printName(OS, getPrintingPolicy());
358 + cast<NamedDecl>(Active->Entity)->printName(OS);
359 if (!isa<FunctionDecl>(Active->Entity)) {
360 printTemplateArgumentList(OS, Active->template_arguments(),
361 getPrintingPolicy());
362 diff --git a/clang/test/AST/ast-dump-record-definition-data-json.cpp b/clang/test/AST/ast-dump-record-definition-data-json.cpp
363 index c102c436a2a4..6be3facf3815 100644
364 --- a/clang/test/AST/ast-dump-record-definition-data-json.cpp
365 +++ b/clang/test/AST/ast-dump-record-definition-data-json.cpp
366 @@ -323,7 +323,7 @@ struct DoesNotAllowConstDefaultInit {
367 // CHECK-NEXT: },
368 // CHECK-NEXT: "isImplicit": true,
369 // CHECK-NEXT: "isReferenced": true,
370 -// CHECK-NEXT: "name": "~(lambda at {{.*}})",
371 +// CHECK-NEXT: "name": "~",
372 // CHECK-NEXT: "mangledName": "_ZZ1fvEN3$_0D1Ev",
373 // CHECK-NEXT: "type": {
374 // CHECK-NEXT: "qualType": "void () noexcept"
375 @@ -708,7 +708,7 @@ struct DoesNotAllowConstDefaultInit {
376 // CHECK-NEXT: },
377 // CHECK-NEXT: "isImplicit": true,
378 // CHECK-NEXT: "isReferenced": true,
379 -// CHECK-NEXT: "name": "~(lambda at {{.*}})",
380 +// CHECK-NEXT: "name": "~",
381 // CHECK-NEXT: "mangledName": "_ZZ1fvEN3$_1D1Ev",
382 // CHECK-NEXT: "type": {
383 // CHECK-NEXT: "qualType": "void () noexcept"
384 diff --git a/clang/test/ExtractAPI/enum.c b/clang/test/ExtractAPI/enum.c
385 index 07d848082981..8c06d850dbda 100644
386 --- a/clang/test/ExtractAPI/enum.c
387 +++ b/clang/test/ExtractAPI/enum.c
388 @@ -694,13 +694,13 @@ enum {
389 "navigator": [
390 {
391 "kind": "identifier",
392 - "spelling": "enum (unnamed)"
393 + "spelling": "(anonymous)"
394 }
395 ],
396 - "title": "enum (unnamed)"
397 + "title": "(anonymous)"
398 },
399 "pathComponents": [
400 - "enum (unnamed)"
401 + "(anonymous)"
402 ]
403 },
404 {
405 @@ -742,7 +742,7 @@ enum {
406 "title": "Constant"
407 },
408 "pathComponents": [
409 - "enum (unnamed)",
410 + "(anonymous)",
411 "Constant"
412 ]
413 },
414 @@ -782,13 +782,13 @@ enum {
415 "navigator": [
416 {
417 "kind": "identifier",
418 - "spelling": "enum (unnamed)"
419 + "spelling": "(anonymous)"
420 }
421 ],
422 - "title": "enum (unnamed)"
423 + "title": "(anonymous)"
424 },
425 "pathComponents": [
426 - "enum (unnamed)"
427 + "(anonymous)"
428 ]
429 },
430 {
431 @@ -830,7 +830,7 @@ enum {
432 "title": "OtherConstant"
433 },
434 "pathComponents": [
435 - "enum (unnamed)",
436 + "(anonymous)",
437 "OtherConstant"
438 ]
439 }
440 diff --git a/clang/test/Index/annotate-comments-typedef.m b/clang/test/Index/annotate-comments-typedef.m
441 index 8447f44ae2c5..77c4d631850d 100644
442 --- a/clang/test/Index/annotate-comments-typedef.m
443 +++ b/clang/test/Index/annotate-comments-typedef.m
444 @@ -36,7 +36,7 @@ typedef struct {
445 int iii;
446 } Foo;
447 // 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>]
448 -// 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>]
449 +// 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>]
450
451
452 struct Foo1 {
453 diff --git a/clang/test/Index/c-index-api-loadTU-test.m b/clang/test/Index/c-index-api-loadTU-test.m
454 index 1aca6b46c439..52f3a56d9800 100644
455 --- a/clang/test/Index/c-index-api-loadTU-test.m
456 +++ b/clang/test/Index/c-index-api-loadTU-test.m
457 @@ -105,7 +105,7 @@ struct X0 {};
458 // CHECK: c-index-api-loadTU-test.m:35:9: ObjCIvarDecl=_anIVar:35:9 (Definition) Extent=[35:5 - 35:16]
459 // CHECK: c-index-api-loadTU-test.m:38:11: ObjCInstanceMethodDecl=bazMethod:38:11 Extent=[38:1 - 38:21]
460 // CHECK: c-index-api-loadTU-test.m:38:4: ObjCClassRef=Foo:4:12 Extent=[38:4 - 38:7]
461 -// CHECK: c-index-api-loadTU-test.m:42:1: EnumDecl=enum (unnamed at {{.*}}):42:1 (Definition) Extent=[42:1 - 44:2]
462 +// CHECK: c-index-api-loadTU-test.m:42:1: EnumDecl=:42:1 (Definition) Extent=[42:1 - 44:2]
463 // CHECK: c-index-api-loadTU-test.m:43:3: EnumConstantDecl=someEnum:43:3 (Definition) Extent=[43:3 - 43:11]
464 // CHECK: c-index-api-loadTU-test.m:46:5: FunctionDecl=main:46:5 (Definition) Extent=[46:1 - 55:2]
465 // CHECK: c-index-api-loadTU-test.m:46:15: ParmDecl=argc:46:15 (Definition) Extent=[46:11 - 46:19]
466 diff --git a/clang/test/Index/c-index-getCursor-test.m b/clang/test/Index/c-index-getCursor-test.m
467 index 0a9e1ab67b40..2361af62ab70 100644
468 --- a/clang/test/Index/c-index-getCursor-test.m
469 +++ b/clang/test/Index/c-index-getCursor-test.m
470 @@ -102,9 +102,9 @@ void f() {
471 // CHECK: [36:7 - 36:21] ObjCInstanceMethodDecl=bazMethod:36:1
472 // CHECK: [36:21 - 38:5] ObjCInterfaceDecl=Baz:31:12
473 // CHECK: [38:5 - 40:1] Invalid Cursor => NoDeclFound
474 -// CHECK: [40:1 - 41:3] EnumDecl=enum (unnamed at {{.*}}):40:1 (Definition)
475 +// CHECK: [40:1 - 41:3] EnumDecl=:40:1 (Definition)
476 // CHECK: [41:3 - 41:11] EnumConstantDecl=someEnum:41:3 (Definition)
477 -// CHECK: [41:11 - 42:2] EnumDecl=enum (unnamed at {{.*}}):40:1 (Definition)
478 +// CHECK: [41:11 - 42:2] EnumDecl=:40:1 (Definition)
479 // CHECK: [42:2 - 44:1] Invalid Cursor => NoDeclFound
480 // CHECK: [44:1 - 44:11] FunctionDecl=main:44:5 (Definition)
481 // CHECK: [44:11 - 44:19] ParmDecl=argc:44:15 (Definition)
482 diff --git a/clang/test/Index/print-type.c b/clang/test/Index/print-type.c
483 index 1e5a7248d89c..65cb80114767 100644
484 --- a/clang/test/Index/print-type.c
485 +++ b/clang/test/Index/print-type.c
486 @@ -69,10 +69,10 @@ _Atomic(unsigned long) aul;
487 // CHECK: StructDecl=Struct:16:8 (Definition) [type=struct Struct] [typekind=Record] [isPOD=1]
488 // CHECK: FunctionDecl=elaboratedStructType:16:32 [type=struct Struct ()] [typekind=FunctionNoProto] [canonicaltype=struct Struct ()] [canonicaltypekind=FunctionNoProto] [resulttype=struct Struct] [resulttypekind=Elaborated] [isPOD=0]
489 // CHECK: TypeRef=struct Struct:16:8 [type=struct Struct] [typekind=Record] [isPOD=1]
490 -// 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]
491 -// 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]
492 -// 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]
493 +// CHECK: StructDecl=:18:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:18:1)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
494 +// CHECK: StructDecl=:23:1 (Definition) [type=struct (unnamed at {{.*}}print-type.c:23:1)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1] [isAnonRecDecl=0]
495 +// CHECK: StructDecl=:24:3 (Definition) [type=struct (anonymous at {{.*}}print-type.c:24:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=1]
496 // CHECK: FieldDecl=x:25:17 (Definition) [type=_Atomic(int)] [typekind=Atomic] [valuetype=int] [valuetypekind=Int] [isPOD=0] [isAnonRecDecl=0]
497 // CHECK: FieldDecl=y:26:9 (Definition) [type=int] [typekind=Int] [isPOD=1] [isAnonRecDecl=0]
498 -// 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]
499 +// CHECK: StructDecl=:30:10 (Definition) [type=struct (unnamed at {{.*}}print-type.c:30:10)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1] [isAnonRecDecl=0]
500 // CHECK: VarDecl=aul:32:24 [type=_Atomic(unsigned long)] [typekind=Atomic] [valuetype=unsigned long] [valuetypekind=ULong] [isPOD=0] [isAnonRecDecl=0]
501 diff --git a/clang/test/Index/print-type.cpp b/clang/test/Index/print-type.cpp
502 index ed298a7810ae..f049ce722741 100644
503 --- a/clang/test/Index/print-type.cpp
504 +++ b/clang/test/Index/print-type.cpp
505 @@ -201,9 +201,9 @@ inline namespace InlineNS {}
506 // 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]
507 // 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]
508 // 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]
509 -// 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]
510 -// 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]
511 -// 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]
512 -// CHECK: EnumDecl=(unnamed enum at {{.*}}:87:3 (Definition) [type=X::(unnamed enum at {{.*}}print-type.cpp:87:3)] [typekind=Enum] [isPOD=1] [isAnon=1]
513 +// CHECK: StructDecl=:84:3 (Definition) [type=X::(anonymous struct at {{.*}}print-type.cpp:84:3)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1]
514 +// CHECK: ClassDecl=:85:3 (Definition) [type=X::(anonymous class at {{.*}}print-type.cpp:85:3)] [typekind=Record] [isPOD=1] [nbFields=1] [isAnon=1]
515 +// CHECK: UnionDecl=:86:3 (Definition) [type=X::(anonymous union at {{.*}}print-type.cpp:86:3)] [typekind=Record] [isPOD=1] [nbFields=2] [isAnon=1]
516 +// CHECK: EnumDecl=:87:3 (Definition) [type=X::(unnamed enum at {{.*}}print-type.cpp:87:3)] [typekind=Enum] [isPOD=1] [isAnon=1]
517 // CHECK: Namespace=:90:11 (Definition) [type=] [typekind=Invalid] [isPOD=0] [isAnon=1]
518 // CHECK: Namespace=InlineNS:94:18 (Definition) [type=] [typekind=Invalid] [isPOD=0] [isAnonRecDecl=0] [isInlineNamespace=1]
519 diff --git a/clang/test/Index/targeted-annotation.c b/clang/test/Index/targeted-annotation.c
520 index daf30986e948..022a139d36db 100644
521 --- a/clang/test/Index/targeted-annotation.c
522 +++ b/clang/test/Index/targeted-annotation.c
523 @@ -45,10 +45,10 @@ int LocalVar2;
524
525 // FIELD: Keyword: "int" [2:3 - 2:6] FieldDecl=z:2:7 (Definition)
526 // FIELD: Identifier: "z" [2:7 - 2:8] FieldDecl=z:2:7 (Definition)
527 -// FIELD: Punctuation: ";" [2:8 - 2:9] StructDecl=Vector:13:9 (Definition)
528 +// FIELD: Punctuation: ";" [2:8 - 2:9] StructDecl=:13:9 (Definition)
529 // FIELD: Keyword: "int" [3:3 - 3:6] FieldDecl=w:3:7 (Definition)
530 // FIELD: Identifier: "w" [3:7 - 3:8] FieldDecl=w:3:7 (Definition)
531 -// FIELD: Punctuation: ";" [3:8 - 3:9] StructDecl=Vector:13:9 (Definition)
532 +// FIELD: Punctuation: ";" [3:8 - 3:9] StructDecl=:13:9 (Definition)
533
534 // RUN: env CINDEXTEST_FAILONERROR=1 c-index-test -test-annotate-tokens=%S/targeted-nested1.h:1:1:3:1 %s -include %t.h \
535 // RUN: -Xclang -error-on-deserialized-decl=TopVar \
536 @@ -86,12 +86,12 @@ int LocalVar2;
537 // TOP: Punctuation: "#" [5:1 - 5:2] inclusion directive=targeted-nested1.h
538 // TOP: Identifier: "include" [5:2 - 5:9] inclusion directive=targeted-nested1.h
539 // TOP: Literal: ""targeted-nested1.h"" [5:10 - 5:30] inclusion directive=targeted-nested1.h
540 -// TOP: Keyword: "enum" [7:1 - 7:5] EnumDecl=enum (unnamed at {{.*}}):7:1 (Definition)
541 -// TOP: Punctuation: "{" [7:6 - 7:7] EnumDecl=enum (unnamed at {{.*}}):7:1 (Definition)
542 +// TOP: Keyword: "enum" [7:1 - 7:5] EnumDecl=:7:1 (Definition)
543 +// TOP: Punctuation: "{" [7:6 - 7:7] EnumDecl=:7:1 (Definition)
544 // TOP: Identifier: "VALUE" [8:3 - 8:8] EnumConstantDecl=VALUE:8:3 (Definition)
545 // TOP: Punctuation: "=" [8:9 - 8:10] EnumConstantDecl=VALUE:8:3 (Definition)
546 // TOP: Literal: "3" [8:11 - 8:12] IntegerLiteral=
547 -// TOP: Punctuation: "}" [9:1 - 9:2] EnumDecl=enum (unnamed at {{.*}}):7:1 (Definition)
548 +// TOP: Punctuation: "}" [9:1 - 9:2] EnumDecl=:7:1 (Definition)
549 // TOP: Punctuation: ";" [9:2 - 9:3]
550 // TOP: Keyword: "extern" [11:1 - 11:7]
551 // TOP: Keyword: "int" [11:8 - 11:11] VarDecl=TopVar:11:12
552 diff --git a/clang/test/Index/targeted-cursor.c b/clang/test/Index/targeted-cursor.c
553 index 1bb4a51e4959..7efc07fad798 100644
554 --- a/clang/test/Index/targeted-cursor.c
555 +++ b/clang/test/Index/targeted-cursor.c
556 @@ -62,4 +62,4 @@ int LocalVar2;
557 // PREAMBLE-CURSOR1: VarDecl=PreambleVar:2:12
558
559 // FIELD-CURSOR1: FieldDecl=z:2:7 (Definition)
560 -// FIELD-CURSOR2: StructDecl=Vector:13:9 (Definition)
561 +// FIELD-CURSOR2: StructDecl=:13:9 (Definition)
562 diff --git a/clang/test/Index/usrs.m b/clang/test/Index/usrs.m
563 index 9a1407ce5189..d0a860e1afad 100644
564 --- a/clang/test/Index/usrs.m
565 +++ b/clang/test/Index/usrs.m
566 @@ -185,14 +185,14 @@ int test_multi_declaration(void) {
567 // CHECK-source: usrs.m:3:52: BinaryOperator= Extent=[3:52 - 3:57]
568 // CHECK-source: usrs.m:3:52: DeclRefExpr=x:3:33 Extent=[3:52 - 3:53]
569 // CHECK-source: usrs.m:3:56: DeclRefExpr=y:3:40 Extent=[3:56 - 3:57]
570 -// CHECK-source: usrs.m:5:1: EnumDecl=enum (unnamed at {{.*}}):5:1 (Definition) Extent=[5:1 - 8:2]
571 +// CHECK-source: usrs.m:5:1: EnumDecl=:5:1 (Definition) Extent=[5:1 - 8:2]
572 // CHECK-source: usrs.m:6:3: EnumConstantDecl=ABA:6:3 (Definition) Extent=[6:3 - 6:6]
573 // CHECK-source: usrs.m:7:3: EnumConstantDecl=CADABA:7:3 (Definition) Extent=[7:3 - 7:9]
574 -// CHECK-source: usrs.m:10:1: EnumDecl=enum (unnamed at {{.*}}):10:1 (Definition) Extent=[10:1 - 13:2]
575 +// CHECK-source: usrs.m:10:1: EnumDecl=:10:1 (Definition) Extent=[10:1 - 13:2]
576 // CHECK-source: usrs.m:11:3: EnumConstantDecl=FOO:11:3 (Definition) Extent=[11:3 - 11:6]
577 // CHECK-source: usrs.m:12:3: EnumConstantDecl=BAR:12:3 (Definition) Extent=[12:3 - 12:6]
578 // CHECK-source: usrs.m:18:3: TypedefDecl=MyStruct:18:3 (Definition) Extent=[15:1 - 18:11]
579 -// CHECK-source: usrs.m:15:9: StructDecl=MyStruct:15:9 (Definition) Extent=[15:9 - 18:2]
580 +// CHECK-source: usrs.m:15:9: StructDecl=:15:9 (Definition) Extent=[15:9 - 18:2]
581 // CHECK-source: usrs.m:16:7: FieldDecl=wa:16:7 (Definition) Extent=[16:3 - 16:9]
582 // CHECK-source: usrs.m:17:7: FieldDecl=moo:17:7 (Definition) Extent=[17:3 - 17:10]
583 // CHECK-source: usrs.m:20:6: EnumDecl=Pizza:20:6 (Definition) Extent=[20:1 - 23:2]
584 diff --git a/clang/test/Sema/address-packed.c b/clang/test/Sema/address-packed.c
585 index 29f12490e9fa..e149a5340bee 100644
586 --- a/clang/test/Sema/address-packed.c
587 +++ b/clang/test/Sema/address-packed.c
588 @@ -136,7 +136,7 @@ struct S4 {
589 };
590
591 int *g4(struct S4 *s4) {
592 - return &s4->inner.i; // expected-warning {{packed member 'i' of class or structure 'S4::struct (unnamed at}}
593 + return &s4->inner.i; // expected-warning {{packed member 'i' of class or structure 'S4::(anonymous)'}}
594 }
595
596 struct S5 {
597 @@ -148,7 +148,7 @@ struct S5 {
598 };
599
600 int *g5(struct S5 *s5) {
601 - return &s5->inner.i; // expected-warning {{packed member 'i' of class or structure 'S5::struct (unnamed at}}
602 + return &s5->inner.i; // expected-warning {{packed member 'i' of class or structure 'S5::(anonymous)'}}
603 }
604
605 struct __attribute__((packed, aligned(2))) AlignedTo2 {
606 @@ -200,7 +200,7 @@ struct S6 {
607 };
608
609 int *anonymousInnerUnion(struct S6 *s) {
610 - return &s->x; // expected-warning {{packed member 'x' of class or structure 'S6::union (anonymous at}}
611 + return &s->x; // expected-warning {{packed member 'x' of class or structure 'S6::(anonymous)'}}
612 }
613
614 struct S6a {
615 @@ -212,7 +212,7 @@ struct S6a {
616 } __attribute__((packed, aligned(16))) s6;
617
618 void g8(void)
619 -{
620 +{
621 f1(&s6.a); // no-warning
622 f1(&s6.c); // no-warning
623 f1(&s6.d); // expected-warning {{packed member 'd' of class or structure 'S6a'}}
624 diff --git a/clang/test/Sema/attr-flag-enum.c b/clang/test/Sema/attr-flag-enum.c
625 index e90f7b2e46e4..467afd950973 100644
626 --- a/clang/test/Sema/attr-flag-enum.c
627 +++ b/clang/test/Sema/attr-flag-enum.c
628 @@ -7,7 +7,7 @@ enum __attribute__((flag_enum)) flag {
629 };
630
631 enum __attribute__((flag_enum)) {
632 - g = 0x7, // expected-warning {{enumeration value 'g' is out of range of flags in enumeration type 'enum (unnamed at}}
633 + g = 0x7, // expected-warning {{enumeration value 'g' is out of range of flags in enumeration type ''}}
634 };
635
636 enum __attribute__((flag_enum)) flag2 {
637 diff --git a/clang/test/SemaCXX/attr-unused.cpp b/clang/test/SemaCXX/attr-unused.cpp
638 index 292be7dcc711..5bca693864e3 100644
639 --- a/clang/test/SemaCXX/attr-unused.cpp
640 +++ b/clang/test/SemaCXX/attr-unused.cpp
641 @@ -10,7 +10,7 @@ void f() {
642 ns_not_unused::Int_not_unused i1; // expected-warning {{unused variable}}
643 ns_unused::Int_unused i0; // expected-warning {{'Int_unused' was marked unused but was used}}
644
645 - union __attribute__((unused)) { // expected-warning {{was marked unused but was used}}
646 + union __attribute__((unused)) { // expected-warning {{'' was marked unused but was used}}
647 int i;
648 };
649 (void) i;
650 diff --git a/clang/test/SemaCXX/lambda-expressions.cpp b/clang/test/SemaCXX/lambda-expressions.cpp
651 index 4ad880835e6d..71a876f6f9b3 100644
652 --- a/clang/test/SemaCXX/lambda-expressions.cpp
653 +++ b/clang/test/SemaCXX/lambda-expressions.cpp
654 @@ -121,7 +121,7 @@ namespace SpecialMembers {
655 void g(P &p, Q &q, R &r) {
656 // FIXME: The note attached to the second error here is just amazingly bad.
657 auto pp = [p]{}; // expected-error {{deleted constructor}} expected-cxx14-error {{deleted copy constructor of '(lambda}}
658 - // expected-cxx14-note-re@-1 {{copy constructor of '(lambda at {{.*}})' is implicitly deleted because field '' has a deleted copy constructor}}
659 + // expected-cxx14-note@-1 {{copy constructor of '' is implicitly deleted because field '' has a deleted copy constructor}}
660 auto qq = [q]{}; // expected-error {{deleted function}} expected-note {{because}}
661
662 auto a = [r]{}; // expected-note 2{{here}}
663 @@ -306,16 +306,16 @@ namespace lambdas_in_NSDMIs {
664 template<class T>
665 struct L {
666 T t{};
667 - T t2 = ([](int a) { return [](int b) { return b; };})(t)(t);
668 + T t2 = ([](int a) { return [](int b) { return b; };})(t)(t);
669 };
670 - L<int> l;
671 -
672 + L<int> l;
673 +
674 namespace non_template {
675 struct L {
676 int t = 0;
677 - int t2 = ([](int a) { return [](int b) { return b; };})(t)(t);
678 + int t2 = ([](int a) { return [](int b) { return b; };})(t)(t);
679 };
680 - L l;
681 + L l;
682 }
683 }
684
685 @@ -534,9 +534,9 @@ template <int N>
686 class S {};
687
688 void foo() {
689 - const int num = 18;
690 + const int num = 18;
691 auto outer = []() {
692 - auto inner = [](S<num> &X) {};
693 + auto inner = [](S<num> &X) {};
694 };
695 }
696 }
697 @@ -584,9 +584,9 @@ void foo1() {
698 }
699
700 namespace PR25627_dont_odr_use_local_consts {
701 -
702 +
703 template<int> struct X {};
704 -
705 +
706 void foo() {
707 const int N = 10;
708 (void) [] { X<N> x; };
709 diff --git a/clang/test/SemaCXX/ms-interface.cpp b/clang/test/SemaCXX/ms-interface.cpp
710 index c6fc77712e25..67294f761d03 100644
711 --- a/clang/test/SemaCXX/ms-interface.cpp
712 +++ b/clang/test/SemaCXX/ms-interface.cpp
713 @@ -10,7 +10,7 @@ __interface I1 {
714 bool operator!();
715 // expected-error@+1 {{operator 'operator int' is not permitted within an interface type}}
716 operator int();
717 - // expected-error-re@+1 {{nested class I1::(unnamed struct at {{.*}}) is not permitted within an interface type}}
718 + // expected-error@+1 {{nested class I1::(anonymous) is not permitted within an interface type}}
719 struct { int a; };
720 void fn2() {
721 struct A { }; // should be ignored: not a nested class
722 diff --git a/clang/test/SemaObjCXX/arc-0x.mm b/clang/test/SemaObjCXX/arc-0x.mm
723 index 743fabf667a1..b7f27e4e19db 100644
724 --- a/clang/test/SemaObjCXX/arc-0x.mm
725 +++ b/clang/test/SemaObjCXX/arc-0x.mm
726 @@ -154,7 +154,7 @@ namespace test_union {
727 // functions of the containing class.
728 struct S0 {
729 union {
730 - id f0; // expected-note-re 6 {{{{.*}} of '(anonymous union at {{.*}})' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
731 + id f0; // expected-note 6 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
732 char f1;
733 };
734 };
735 @@ -162,7 +162,7 @@ namespace test_union {
736 struct S1 {
737 union {
738 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}}
739 - id f0; // expected-note-re 2 {{{{.*}} of '(anonymous union at {{.*}}' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
740 + id f0; // expected-note 2 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
741 char f1;
742 };
743 int f2;
744 @@ -190,13 +190,13 @@ namespace test_union {
745 S2 *x6;
746
747 static union { // expected-error {{call to implicitly-deleted default constructor of}}
748 - id g0; // expected-note-re {{default constructor of '(unnamed union at {{.*}}' is implicitly deleted because variant field 'g0' is an ObjC pointer}}
749 + id g0; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g0' is an ObjC pointer}}
750 };
751
752 static union { // expected-error {{call to implicitly-deleted default constructor of}}
753 - union { // expected-note-re {{default constructor of '(unnamed union at {{.*}}' is implicitly deleted because field '' has a deleted default constructor}}
754 - union { // expected-note-re {{default constructor of '(anonymous union at {{.*}}' is implicitly deleted because field '' has a deleted default constructor}}
755 - __weak id g1; // expected-note-re {{default constructor of '(anonymous union at {{.*}}' is implicitly deleted because variant field 'g1' is an ObjC pointer}}
756 + union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}}
757 + union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}}
758 + __weak id g1; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g1' is an ObjC pointer}}
759 int g2;
760 };
761 int g3;
762 diff --git a/clang/test/Templight/templight-empty-entries-fix.cpp b/clang/test/Templight/templight-empty-entries-fix.cpp
763 index ad029d307075..9154e56fa24a 100644
764 --- a/clang/test/Templight/templight-empty-entries-fix.cpp
765 +++ b/clang/test/Templight/templight-empty-entries-fix.cpp
766 @@ -5,13 +5,13 @@ void a() {
767 }
768
769 // CHECK-LABEL: {{^---$}}
770 -// CHECK: {{^name:[ ]+'\(lambda at .*templight-empty-entries-fix.cpp:4:3\)'$}}
771 +// CHECK: {{^name:[ ]+'lambda at .*templight-empty-entries-fix.cpp:4:3'$}}
772 // CHECK: {{^kind:[ ]+Memoization$}}
773 // CHECK: {{^event:[ ]+Begin$}}
774 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
775 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
776 // CHECK-LABEL: {{^---$}}
777 -// CHECK: {{^name:[ ]+'\(lambda at .*templight-empty-entries-fix.cpp:4:3\)'$}}
778 +// CHECK: {{^name:[ ]+'lambda at .*templight-empty-entries-fix.cpp:4:3'$}}
779 // CHECK: {{^kind:[ ]+Memoization$}}
780 // CHECK: {{^event:[ ]+End$}}
781 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:4:3'$}}
782 @@ -225,37 +225,37 @@ void e() {
783 }
784
785 // CHECK-LABEL: {{^---$}}
786 -// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
787 +// CHECK: {{^name:[ ]+unnamed struct$}}
788 // CHECK: {{^kind:[ ]+Memoization$}}
789 // CHECK: {{^event:[ ]+Begin$}}
790 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
791 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
792 // CHECK-LABEL: {{^---$}}
793 -// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
794 +// CHECK: {{^name:[ ]+unnamed struct$}}
795 // CHECK: {{^kind:[ ]+Memoization$}}
796 // CHECK: {{^event:[ ]+End$}}
797 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
798 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
799 // CHECK-LABEL: {{^---$}}
800 -// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
801 +// CHECK: {{^name:[ ]+unnamed struct$}}
802 // CHECK: {{^kind:[ ]+Memoization$}}
803 // CHECK: {{^event:[ ]+Begin$}}
804 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
805 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
806 // CHECK-LABEL: {{^---$}}
807 -// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
808 +// CHECK: {{^name:[ ]+unnamed struct$}}
809 // CHECK: {{^kind:[ ]+Memoization$}}
810 // CHECK: {{^event:[ ]+End$}}
811 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
812 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:224:5'$}}
813 // CHECK-LABEL: {{^---$}}
814 -// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
815 +// CHECK: {{^name:[ ]+unnamed struct$}}
816 // CHECK: {{^kind:[ ]+Memoization$}}
817 // CHECK: {{^event:[ ]+Begin$}}
818 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
819 // CHECK: {{^poi:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
820 // CHECK-LABEL: {{^---$}}
821 -// CHECK: {{^name:[ ]+'\(unnamed struct at .*templight-empty-entries-fix.cpp:223:3\)'$}}
822 +// CHECK: {{^name:[ ]+unnamed struct$}}
823 // CHECK: {{^kind:[ ]+Memoization$}}
824 // CHECK: {{^event:[ ]+End$}}
825 // CHECK: {{^orig:[ ]+'.*templight-empty-entries-fix.cpp:223:3'$}}
826 diff --git a/clang/unittests/AST/ASTTraverserTest.cpp b/clang/unittests/AST/ASTTraverserTest.cpp
827 index 362f37655a0a..87fbcd852f49 100644
828 --- a/clang/unittests/AST/ASTTraverserTest.cpp
829 +++ b/clang/unittests/AST/ASTTraverserTest.cpp
830 @@ -1011,7 +1011,7 @@ LambdaExpr
831 | |-FieldDecl ''
832 | |-FieldDecl ''
833 | |-FieldDecl ''
834 -| `-CXXDestructorDecl '~(lambda at input.cc:9:3)'
835 +| `-CXXDestructorDecl '~'
836 |-ImplicitCastExpr
837 | `-DeclRefExpr 'a'
838 |-DeclRefExpr 'b'
839 diff --git a/llvm/utils/lit/lit/TestRunner.py b/llvm/utils/lit/lit/TestRunner.py
840 index 664235beaae6..300c17bfea3a 100644
841 --- a/llvm/utils/lit/lit/TestRunner.py
842 +++ b/llvm/utils/lit/lit/TestRunner.py
843 @@ -1174,7 +1174,6 @@ def getDefaultSubstitutions(test, tmpDir, tmpBase, normalize_slashes=False):
844 ('%/p', sourcedir.replace('\\', '/')),
845 ('%/t', tmpBase.replace('\\', '/') + '.tmp'),
846 ('%/T', tmpDir.replace('\\', '/')),
847 - ('%/et',tmpName.replace('\\', '\\\\\\\\\\\\\\\\')),
848 ])
849
850 # "%{/[STpst]:regex_replacement}" should be normalized like "%/[STpst]" but we're
851 --
852 2.38.0.1.g45972b9c23
853