[PATCH 3/4] [clang] Improve nested name specifier AST representation #148014

mizvekov · 2025-07-10T17:56:14Z

clang test changes

Second patch in the series, starting at #147835

llvmbot · 2025-07-10T17:56:52Z

@llvm/pr-subscribers-clang

Author: Matheus Izvekov (mizvekov)

Changes

clang test changes

Second patch in the series, starting at #147835

Patch is 561.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/148014.diff

181 Files Affected:

(modified) clang/test/AST/HLSL/StructuredBuffers-AST.hlsl (+18-18)
(modified) clang/test/AST/HLSL/TypedBuffers-AST.hlsl (+12-12)
(modified) clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl (+2-2)
(modified) clang/test/AST/HLSL/vector-constructors.hlsl (+4-4)
(modified) clang/test/AST/arm-mfp8.cpp (+1-1)
(modified) clang/test/AST/ast-dump-color.cpp (+8-8)
(modified) clang/test/AST/ast-dump-ctad-alias.cpp (+11-12)
(modified) clang/test/AST/ast-dump-cxx2b-deducing-this.cpp (+1-1)
(modified) clang/test/AST/ast-dump-decl-json.c (-3)
(modified) clang/test/AST/ast-dump-decl.cpp (+19-19)
(modified) clang/test/AST/ast-dump-expr-json.cpp (-14)
(modified) clang/test/AST/ast-dump-expr.cpp (+2-5)
(modified) clang/test/AST/ast-dump-for-range-lifetime.cpp (+159-159)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp (+12-12)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_template_3.cpp (+1-1)
(modified) clang/test/AST/ast-dump-record-definition-data-json.cpp (-5)
(modified) clang/test/AST/ast-dump-records-json.cpp (-2)
(modified) clang/test/AST/ast-dump-records.c (+3-5)
(modified) clang/test/AST/ast-dump-records.cpp (+3-5)
(modified) clang/test/AST/ast-dump-recovery.cpp (+3-3)
(modified) clang/test/AST/ast-dump-stmt-json.cpp (+84-2)
(modified) clang/test/AST/ast-dump-stmt.m (+1-1)
(modified) clang/test/AST/ast-dump-template-decls.cpp (+1-2)
(modified) clang/test/AST/ast-dump-template-json-win32-mangler-crash.cpp (+45-67)
(modified) clang/test/AST/ast-dump-template-name.cpp (+22-25)
(modified) clang/test/AST/ast-dump-templates.cpp (+112-103)
(modified) clang/test/AST/ast-dump-traits.cpp (+2-3)
(modified) clang/test/AST/ast-dump-types-json.cpp (+45-32)
(modified) clang/test/AST/ast-dump-using-template.cpp (+17-21)
(modified) clang/test/AST/ast-dump-using.cpp (+7-9)
(modified) clang/test/AST/attr-swift_attr.m (+1-1)
(modified) clang/test/AST/coroutine-locals-cleanup.cpp (+2-2)
(modified) clang/test/AST/cxx2c-variadic-friends.cpp (+2-2)
(modified) clang/test/AST/deduction-guides.cpp (+9-9)
(modified) clang/test/AST/float16.cpp (+1-1)
(modified) clang/test/AST/sourceranges.cpp (+3-3)
(modified) clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp (+4-4)
(modified) clang/test/Analysis/anonymous-decls.cpp (+2-2)
(modified) clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp (+1-1)
(modified) clang/test/CXX/class.access/p6.cpp (+1-1)
(modified) clang/test/CXX/class.derived/class.derived.general/p2.cpp (+4-4)
(modified) clang/test/CXX/class/class.mem/class.mem.general/p8.cpp (+4-4)
(modified) clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p3.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-examples.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.meaning/dcl.mptr/p2.cpp (+1-1)
(modified) clang/test/CXX/dcl/dcl.fct/p17.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg0xx.cpp (+3-3)
(modified) clang/test/CXX/drs/cwg12xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg13xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg2149.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg26xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg28xx.cpp (+6-6)
(modified) clang/test/CXX/drs/cwg2xx.cpp (+5-5)
(modified) clang/test/CXX/drs/cwg3xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg4xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg6xx.cpp (+4-4)
(modified) clang/test/CXX/expr/expr.prim/expr.prim.req/compound-requirement.cpp (+1-1)
(modified) clang/test/CXX/over/over.match/over.match.funcs/over.match.class.deduct/p2.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.arg/temp.arg.nontype/p5.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.constr/temp.constr.decl/func-template-decl.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.decls/temp.class.spec/p6.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3-0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.param/p15-cxx0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.res/temp.dep/temp.dep.type/p4.cpp (+20-20)
(modified) clang/test/CodeGen/builtin-bpf-btf-type-id.c (+1-1)
(modified) clang/test/CodeGen/builtins-bpf-preserve-field-info-3.c (+1-1)
(modified) clang/test/Index/Core/index-instantiated-source.cpp (+2-2)
(modified) clang/test/Index/Core/index-source.cpp (+2-2)
(modified) clang/test/Index/c-index-api-loadTU-test.m (+1-1)
(modified) clang/test/Index/copy-assignment-operator.cpp (+2-2)
(modified) clang/test/Index/index-refs.cpp (+2-2)
(modified) clang/test/Index/keep-going.cpp (+2-2)
(modified) clang/test/Index/move-assignment-operator.cpp (+1-1)
(modified) clang/test/Index/opencl-types.cl (+8-8)
(modified) clang/test/Index/paren-type.c (+1-1)
(modified) clang/test/Index/print-type-size.cpp (+4-4)
(modified) clang/test/Index/print-type.c (+7-7)
(modified) clang/test/Index/print-type.cpp (+28-28)
(modified) clang/test/Index/recursive-cxx-member-calls.cpp (+10-10)
(modified) clang/test/Index/redeclarations.cpp (+1-1)
(modified) clang/test/Index/skip-parsed-bodies/compile_commands.json (+3-3)
(modified) clang/test/Misc/diag-template-diffing-cxx11.cpp (+4-4)
(modified) clang/test/Modules/modules-merge-enum.m (+10-14)
(modified) clang/test/Modules/odr_hash.cpp (+6-6)
(modified) clang/test/OpenMP/allocate_modifiers_messages.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_section_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/PCH/cxx-explicit-specifier.cpp (+3-3)
(modified) clang/test/Parser/MicrosoftExtensions.cpp (+1-1)
(modified) clang/test/Parser/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/MicrosoftExtensions.cpp (+4-4)
(modified) clang/test/SemaCXX/builtin-get-vtable-pointer.cpp (+1-1)
(modified) clang/test/SemaCXX/class-base-member-init.cpp (+1-1)
(modified) clang/test/SemaCXX/co_await-ast.cpp (+17-17)
(modified) clang/test/SemaCXX/compound-literal.cpp (+17-17)
(modified) clang/test/SemaCXX/constant-expression.cpp (+1-1)
(modified) clang/test/SemaCXX/constructor.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutine-allocs.cpp (+3-3)
(modified) clang/test/SemaCXX/coroutine-traits-undefined-template.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutines.cpp (+2-2)
(modified) clang/test/SemaCXX/ctad.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx1y-variable-templates_in_class.cpp (+5-5)
(modified) clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/cxx2a-destroying-delete.cpp (+1-1)
(modified) clang/test/SemaCXX/cxx2b-deducing-this.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx2c-variadic-friends.cpp (+1-1)
(modified) clang/test/SemaCXX/destructor.cpp (+3-3)
(modified) clang/test/SemaCXX/elaborated-type-specifier.cpp (+1-1)
(modified) clang/test/SemaCXX/enum-scoped.cpp (+1-1)
(modified) clang/test/SemaCXX/err_init_conversion_failed.cpp (+1-1)
(modified) clang/test/SemaCXX/gh102293.cpp (+1-1)
(modified) clang/test/SemaCXX/incomplete-call.cpp (+1-1)
(modified) clang/test/SemaCXX/matrix-casts.cpp (+2-2)
(modified) clang/test/SemaCXX/nested-name-spec.cpp (+5-3)
(modified) clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp (+2-2)
(modified) clang/test/SemaCXX/pseudo-destructors.cpp (+1-1)
(modified) clang/test/SemaCXX/return.cpp (+2-2)
(modified) clang/test/SemaCXX/static-assert.cpp (+1-1)
(modified) clang/test/SemaCXX/sugar-common-types.cpp (+3-2)
(modified) clang/test/SemaCXX/sugared-auto.cpp (+1-1)
(modified) clang/test/SemaCXX/type-aware-coroutines.cpp (+4-4)
(modified) clang/test/SemaCXX/undefined-partial-specialization.cpp (+1-1)
(modified) clang/test/SemaObjCXX/Inputs/nullability-pragmas-1.h (+1-1)
(modified) clang/test/SemaObjCXX/arc-bridged-cast.mm (+2-2)
(modified) clang/test/SemaObjCXX/objc-boxed-expressions-nsvalue.mm (+2-2)
(modified) clang/test/SemaObjCXX/objcbridge-attribute-arc.mm (+89-89)
(modified) clang/test/SemaObjCXX/objcbridge-attribute.mm (+90-90)
(modified) clang/test/SemaObjCXX/objcbridge-related-attribute.mm (+6-6)
(modified) clang/test/SemaObjCXX/objcbridge-static-cast.mm (+52-52)
(modified) clang/test/SemaOpenACC/combined-construct-num_workers-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-intexpr-clause-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-varlist-ast.cpp (+2-2)
(modified) clang/test/SemaTemplate/aggregate-deduction-candidate.cpp (+41-43)
(modified) clang/test/SemaTemplate/ctad.cpp (+4-4)
(modified) clang/test/SemaTemplate/current-instantiation.cpp (+1-1)
(modified) clang/test/SemaTemplate/deduction-crash.cpp (+2-2)
(modified) clang/test/SemaTemplate/deduction-guide.cpp (+46-50)
(modified) clang/test/SemaTemplate/dependent-base-classes.cpp (+5-5)
(modified) clang/test/SemaTemplate/dependent-names.cpp (+1-1)
(modified) clang/test/SemaTemplate/elaborated-type-specifier.cpp (+4-7)
(modified) clang/test/SemaTemplate/instantiate-requires-expr.cpp (+2-2)
(modified) clang/test/SemaTemplate/make_integer_seq.cpp (+78-84)
(modified) clang/test/SemaTemplate/ms-lookup-template-base-classes.cpp (+1-1)
(modified) clang/test/SemaTemplate/ms-sizeof-missing-typename.cpp (+6-6)
(modified) clang/test/SemaTemplate/nested-implicit-deduction-guides.cpp (+3-3)
(modified) clang/test/SemaTemplate/nested-name-spec-template.cpp (+1-1)
(modified) clang/test/SemaTemplate/nested-template.cpp (+2-2)
(modified) clang/test/SemaTemplate/overload-candidates.cpp (+6-6)
(modified) clang/test/SemaTemplate/temp_arg_nontype.cpp (+1-1)
(modified) clang/test/SemaTemplate/template-id-expr.cpp (+1-1)
(modified) clang/test/SemaTemplate/type_pack_element.cpp (+41-45)
(modified) clang/test/SemaTemplate/typename-specifier-4.cpp (+1-1)
(modified) clang/test/SemaTemplate/typename-specifier.cpp (+3-3)
(modified) clang/unittests/AST/ASTContextParentMapTest.cpp (+5-5)
(modified) clang/unittests/AST/ASTExprTest.cpp (+2-2)
(modified) clang/unittests/AST/ASTImporterFixtures.h (+1-2)
(modified) clang/unittests/AST/ASTImporterTest.cpp (+61-71)
(modified) clang/unittests/AST/DeclPrinterTest.cpp (+30-32)
(modified) clang/unittests/AST/ProfilingTest.cpp (+4-4)
(modified) clang/unittests/AST/RandstructTest.cpp (+1-1)
(modified) clang/unittests/AST/RecursiveASTVisitorTest.cpp (+3-2)
(modified) clang/unittests/AST/SizelessTypesTest.cpp (+1-1)
(modified) clang/unittests/AST/StructuralEquivalenceTest.cpp (+9-6)
(modified) clang/unittests/AST/TemplateNameTest.cpp (+6-7)
(modified) clang/unittests/AST/TypePrinterTest.cpp (+5-8)
(modified) clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp (+11-14)
(modified) clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp (+9-79)
(modified) clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp (+102-143)
(modified) clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp (+3-3)
(modified) clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp (+1-1)
(modified) clang/unittests/CodeGen/CodeGenExternalTest.cpp (+2-3)
(modified) clang/unittests/Index/IndexTests.cpp (+1-1)
(modified) clang/unittests/Sema/HeuristicResolverTest.cpp (+19-13)
(modified) clang/unittests/StaticAnalyzer/SValTest.cpp (+5-8)
(modified) clang/unittests/Tooling/LookupTest.cpp (+9-9)
(modified) clang/unittests/Tooling/QualTypeNamesTest.cpp (+18-22)
(modified) clang/unittests/Tooling/RangeSelectorTest.cpp (+3-3)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp (+6-6)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp (+1-1)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp (+11-8)
(modified) clang/unittests/Tooling/RefactoringTest.cpp (+6-2)

diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index b74e183eec9cc..d319bee54aa6f 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -91,21 +91,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -114,12 +114,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -129,7 +129,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -138,12 +138,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -166,7 +166,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -183,7 +183,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -204,7 +204,7 @@ RESOURCE<float> Buffer;
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-LOAD-SAME: ' lvalue .__handle {{.*}}
-// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-LOAD-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-LOAD-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -220,7 +220,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -236,7 +236,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' -1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -254,7 +254,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -262,7 +262,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} 'element_type' ParmVar {{.*}} 'value' 'element_type'
 
@@ -279,7 +279,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -287,7 +287,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: IntegerLiteral {{.*}} 'int' -1
 
 // CHECK: ClassTemplateSpecializationDecl {{.*}} class [[RESOURCE]] definition
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index d098e5a323ca7..53e4b27c91dac 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -66,21 +66,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -89,12 +89,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -104,7 +104,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -113,12 +113,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -141,7 +141,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -158,7 +158,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -177,7 +177,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
diff --git a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
index 2f08531000f32..1c5e06789c3e4 100644
--- a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
+++ b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
@@ -63,9 +63,9 @@ namespace NS2 {
   // CHECK: HLSLBufferDecl {{.*}} line:[[# @LINE + 2]]:11 cbuffer CB2
   // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
   cbuffer CB2 {
-    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo':'hlsl_constant Foo'
+    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo'
     ::Foo foo0;
-    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo':'hlsl_constant NS2::Foo'
+    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo'
     Foo foo1;
     // CHECK: VarDecl {{.*}} foo2 'hlsl_constant NS1::Foo'
     NS1::Foo foo2;
diff --git a/clang/test/AST/HLSL/vector-constructors.hlsl b/clang/test/AST/HLSL/vector-constructors.hlsl
index 31d8dd0fdac8e..fd43a7dcbfcca 100644
--- a/clang/test/AST/HLSL/vector-constructors.hlsl
+++ b/clang/test/AST/HLSL/vector-constructors.hlsl
@@ -88,10 +88,10 @@ void entry() {
 // CHECK-NEXT: InitListExpr
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 
   struct T {
     operator float() const { return 1.0f; }
@@ -105,12 +105,12 @@ void entry() {
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <UserDefinedConversion>
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 
   typedef float2 second_level_of_typedefs;
   second_level_of_typedefs foo6 = float2(1.0f, 2.0f);
diff --git a/clang/test/AST/arm-mfp8.cpp b/clang/test/AST/arm-mfp8.cpp
index 195c734fc753e..b1fa04a3a79c1 100644
--- a/clang/test/AST/arm-mfp8.cpp
+++ b/clang/test/AST/arm-mfp8.cpp
@@ -49,7 +49,7 @@ class C1 {
   }
 };
 
-//CHECK:       | |-CXXRecordDecl {{.*}} referenced class C1
+//CHECK:       | |-CXXRecordDecl {{.*}} class C1
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f1c '__mfp8'
 //CHECK-NEXT:  | |-VarDecl {{.*}} f2c 'const __mfp8' static
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f3c 'volatile __mfp8'
diff --git a/clang/test/AST/ast-dump-color.cpp b/clang/test/AST/ast-dump-color.cpp
index 87797f6bffc5b..2e60e760283de 100644
--- a/clang/test/AST/ast-dump-color.cpp
+++ b/clang/test/AST/ast-dump-color.cpp
@@ -82,15 +82,15 @@ struct Invalid {
 //CHECK: {{^}}[[Blue]]| | `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'const Mutex &'[[RESET]]{{$}}
 //CHECK: {{^}}[[Blue]]| `-[[RESET]][[GREEN]]CXXConstructorDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] implicit constexpr[[CYAN]] Mutex[[RESET]] [[Green]]'void (Mutex &&)'[[RESET]] inline{{ .*$}}
 //CHECK: {{^}}[[Blue]]|   `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'Mutex &&'[[RESET]]{{$}}
-//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]VarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:1[[RESET]], [[Yellow]]line:25:3[[RESET]]> [[Yellow]]col:3[[RESET]] referenced[[CYAN]] mu1[[RESET]] [[Green]]'class Mutex':'Mutex'[[RESET]]
-//CHECK: {{^}}[[Blue]]| `-[[RESET]][[MAGENTA]]CXXConstructExpr[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:3[[RESET]]> [[Green]]'class Mutex...
[truncated]

llvmbot · 2025-07-10T17:56:53Z

@llvm/pr-subscribers-hlsl

Author: Matheus Izvekov (mizvekov)

Changes

clang test changes

Second patch in the series, starting at #147835

Patch is 561.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/148014.diff

181 Files Affected:

(modified) clang/test/AST/HLSL/StructuredBuffers-AST.hlsl (+18-18)
(modified) clang/test/AST/HLSL/TypedBuffers-AST.hlsl (+12-12)
(modified) clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl (+2-2)
(modified) clang/test/AST/HLSL/vector-constructors.hlsl (+4-4)
(modified) clang/test/AST/arm-mfp8.cpp (+1-1)
(modified) clang/test/AST/ast-dump-color.cpp (+8-8)
(modified) clang/test/AST/ast-dump-ctad-alias.cpp (+11-12)
(modified) clang/test/AST/ast-dump-cxx2b-deducing-this.cpp (+1-1)
(modified) clang/test/AST/ast-dump-decl-json.c (-3)
(modified) clang/test/AST/ast-dump-decl.cpp (+19-19)
(modified) clang/test/AST/ast-dump-expr-json.cpp (-14)
(modified) clang/test/AST/ast-dump-expr.cpp (+2-5)
(modified) clang/test/AST/ast-dump-for-range-lifetime.cpp (+159-159)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp (+12-12)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_template_3.cpp (+1-1)
(modified) clang/test/AST/ast-dump-record-definition-data-json.cpp (-5)
(modified) clang/test/AST/ast-dump-records-json.cpp (-2)
(modified) clang/test/AST/ast-dump-records.c (+3-5)
(modified) clang/test/AST/ast-dump-records.cpp (+3-5)
(modified) clang/test/AST/ast-dump-recovery.cpp (+3-3)
(modified) clang/test/AST/ast-dump-stmt-json.cpp (+84-2)
(modified) clang/test/AST/ast-dump-stmt.m (+1-1)
(modified) clang/test/AST/ast-dump-template-decls.cpp (+1-2)
(modified) clang/test/AST/ast-dump-template-json-win32-mangler-crash.cpp (+45-67)
(modified) clang/test/AST/ast-dump-template-name.cpp (+22-25)
(modified) clang/test/AST/ast-dump-templates.cpp (+112-103)
(modified) clang/test/AST/ast-dump-traits.cpp (+2-3)
(modified) clang/test/AST/ast-dump-types-json.cpp (+45-32)
(modified) clang/test/AST/ast-dump-using-template.cpp (+17-21)
(modified) clang/test/AST/ast-dump-using.cpp (+7-9)
(modified) clang/test/AST/attr-swift_attr.m (+1-1)
(modified) clang/test/AST/coroutine-locals-cleanup.cpp (+2-2)
(modified) clang/test/AST/cxx2c-variadic-friends.cpp (+2-2)
(modified) clang/test/AST/deduction-guides.cpp (+9-9)
(modified) clang/test/AST/float16.cpp (+1-1)
(modified) clang/test/AST/sourceranges.cpp (+3-3)
(modified) clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp (+4-4)
(modified) clang/test/Analysis/anonymous-decls.cpp (+2-2)
(modified) clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp (+1-1)
(modified) clang/test/CXX/class.access/p6.cpp (+1-1)
(modified) clang/test/CXX/class.derived/class.derived.general/p2.cpp (+4-4)
(modified) clang/test/CXX/class/class.mem/class.mem.general/p8.cpp (+4-4)
(modified) clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p3.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-examples.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.meaning/dcl.mptr/p2.cpp (+1-1)
(modified) clang/test/CXX/dcl/dcl.fct/p17.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg0xx.cpp (+3-3)
(modified) clang/test/CXX/drs/cwg12xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg13xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg2149.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg26xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg28xx.cpp (+6-6)
(modified) clang/test/CXX/drs/cwg2xx.cpp (+5-5)
(modified) clang/test/CXX/drs/cwg3xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg4xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg6xx.cpp (+4-4)
(modified) clang/test/CXX/expr/expr.prim/expr.prim.req/compound-requirement.cpp (+1-1)
(modified) clang/test/CXX/over/over.match/over.match.funcs/over.match.class.deduct/p2.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.arg/temp.arg.nontype/p5.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.constr/temp.constr.decl/func-template-decl.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.decls/temp.class.spec/p6.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3-0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.param/p15-cxx0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.res/temp.dep/temp.dep.type/p4.cpp (+20-20)
(modified) clang/test/CodeGen/builtin-bpf-btf-type-id.c (+1-1)
(modified) clang/test/CodeGen/builtins-bpf-preserve-field-info-3.c (+1-1)
(modified) clang/test/Index/Core/index-instantiated-source.cpp (+2-2)
(modified) clang/test/Index/Core/index-source.cpp (+2-2)
(modified) clang/test/Index/c-index-api-loadTU-test.m (+1-1)
(modified) clang/test/Index/copy-assignment-operator.cpp (+2-2)
(modified) clang/test/Index/index-refs.cpp (+2-2)
(modified) clang/test/Index/keep-going.cpp (+2-2)
(modified) clang/test/Index/move-assignment-operator.cpp (+1-1)
(modified) clang/test/Index/opencl-types.cl (+8-8)
(modified) clang/test/Index/paren-type.c (+1-1)
(modified) clang/test/Index/print-type-size.cpp (+4-4)
(modified) clang/test/Index/print-type.c (+7-7)
(modified) clang/test/Index/print-type.cpp (+28-28)
(modified) clang/test/Index/recursive-cxx-member-calls.cpp (+10-10)
(modified) clang/test/Index/redeclarations.cpp (+1-1)
(modified) clang/test/Index/skip-parsed-bodies/compile_commands.json (+3-3)
(modified) clang/test/Misc/diag-template-diffing-cxx11.cpp (+4-4)
(modified) clang/test/Modules/modules-merge-enum.m (+10-14)
(modified) clang/test/Modules/odr_hash.cpp (+6-6)
(modified) clang/test/OpenMP/allocate_modifiers_messages.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_section_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/PCH/cxx-explicit-specifier.cpp (+3-3)
(modified) clang/test/Parser/MicrosoftExtensions.cpp (+1-1)
(modified) clang/test/Parser/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/MicrosoftExtensions.cpp (+4-4)
(modified) clang/test/SemaCXX/builtin-get-vtable-pointer.cpp (+1-1)
(modified) clang/test/SemaCXX/class-base-member-init.cpp (+1-1)
(modified) clang/test/SemaCXX/co_await-ast.cpp (+17-17)
(modified) clang/test/SemaCXX/compound-literal.cpp (+17-17)
(modified) clang/test/SemaCXX/constant-expression.cpp (+1-1)
(modified) clang/test/SemaCXX/constructor.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutine-allocs.cpp (+3-3)
(modified) clang/test/SemaCXX/coroutine-traits-undefined-template.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutines.cpp (+2-2)
(modified) clang/test/SemaCXX/ctad.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx1y-variable-templates_in_class.cpp (+5-5)
(modified) clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/cxx2a-destroying-delete.cpp (+1-1)
(modified) clang/test/SemaCXX/cxx2b-deducing-this.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx2c-variadic-friends.cpp (+1-1)
(modified) clang/test/SemaCXX/destructor.cpp (+3-3)
(modified) clang/test/SemaCXX/elaborated-type-specifier.cpp (+1-1)
(modified) clang/test/SemaCXX/enum-scoped.cpp (+1-1)
(modified) clang/test/SemaCXX/err_init_conversion_failed.cpp (+1-1)
(modified) clang/test/SemaCXX/gh102293.cpp (+1-1)
(modified) clang/test/SemaCXX/incomplete-call.cpp (+1-1)
(modified) clang/test/SemaCXX/matrix-casts.cpp (+2-2)
(modified) clang/test/SemaCXX/nested-name-spec.cpp (+5-3)
(modified) clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp (+2-2)
(modified) clang/test/SemaCXX/pseudo-destructors.cpp (+1-1)
(modified) clang/test/SemaCXX/return.cpp (+2-2)
(modified) clang/test/SemaCXX/static-assert.cpp (+1-1)
(modified) clang/test/SemaCXX/sugar-common-types.cpp (+3-2)
(modified) clang/test/SemaCXX/sugared-auto.cpp (+1-1)
(modified) clang/test/SemaCXX/type-aware-coroutines.cpp (+4-4)
(modified) clang/test/SemaCXX/undefined-partial-specialization.cpp (+1-1)
(modified) clang/test/SemaObjCXX/Inputs/nullability-pragmas-1.h (+1-1)
(modified) clang/test/SemaObjCXX/arc-bridged-cast.mm (+2-2)
(modified) clang/test/SemaObjCXX/objc-boxed-expressions-nsvalue.mm (+2-2)
(modified) clang/test/SemaObjCXX/objcbridge-attribute-arc.mm (+89-89)
(modified) clang/test/SemaObjCXX/objcbridge-attribute.mm (+90-90)
(modified) clang/test/SemaObjCXX/objcbridge-related-attribute.mm (+6-6)
(modified) clang/test/SemaObjCXX/objcbridge-static-cast.mm (+52-52)
(modified) clang/test/SemaOpenACC/combined-construct-num_workers-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-intexpr-clause-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-varlist-ast.cpp (+2-2)
(modified) clang/test/SemaTemplate/aggregate-deduction-candidate.cpp (+41-43)
(modified) clang/test/SemaTemplate/ctad.cpp (+4-4)
(modified) clang/test/SemaTemplate/current-instantiation.cpp (+1-1)
(modified) clang/test/SemaTemplate/deduction-crash.cpp (+2-2)
(modified) clang/test/SemaTemplate/deduction-guide.cpp (+46-50)
(modified) clang/test/SemaTemplate/dependent-base-classes.cpp (+5-5)
(modified) clang/test/SemaTemplate/dependent-names.cpp (+1-1)
(modified) clang/test/SemaTemplate/elaborated-type-specifier.cpp (+4-7)
(modified) clang/test/SemaTemplate/instantiate-requires-expr.cpp (+2-2)
(modified) clang/test/SemaTemplate/make_integer_seq.cpp (+78-84)
(modified) clang/test/SemaTemplate/ms-lookup-template-base-classes.cpp (+1-1)
(modified) clang/test/SemaTemplate/ms-sizeof-missing-typename.cpp (+6-6)
(modified) clang/test/SemaTemplate/nested-implicit-deduction-guides.cpp (+3-3)
(modified) clang/test/SemaTemplate/nested-name-spec-template.cpp (+1-1)
(modified) clang/test/SemaTemplate/nested-template.cpp (+2-2)
(modified) clang/test/SemaTemplate/overload-candidates.cpp (+6-6)
(modified) clang/test/SemaTemplate/temp_arg_nontype.cpp (+1-1)
(modified) clang/test/SemaTemplate/template-id-expr.cpp (+1-1)
(modified) clang/test/SemaTemplate/type_pack_element.cpp (+41-45)
(modified) clang/test/SemaTemplate/typename-specifier-4.cpp (+1-1)
(modified) clang/test/SemaTemplate/typename-specifier.cpp (+3-3)
(modified) clang/unittests/AST/ASTContextParentMapTest.cpp (+5-5)
(modified) clang/unittests/AST/ASTExprTest.cpp (+2-2)
(modified) clang/unittests/AST/ASTImporterFixtures.h (+1-2)
(modified) clang/unittests/AST/ASTImporterTest.cpp (+61-71)
(modified) clang/unittests/AST/DeclPrinterTest.cpp (+30-32)
(modified) clang/unittests/AST/ProfilingTest.cpp (+4-4)
(modified) clang/unittests/AST/RandstructTest.cpp (+1-1)
(modified) clang/unittests/AST/RecursiveASTVisitorTest.cpp (+3-2)
(modified) clang/unittests/AST/SizelessTypesTest.cpp (+1-1)
(modified) clang/unittests/AST/StructuralEquivalenceTest.cpp (+9-6)
(modified) clang/unittests/AST/TemplateNameTest.cpp (+6-7)
(modified) clang/unittests/AST/TypePrinterTest.cpp (+5-8)
(modified) clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp (+11-14)
(modified) clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp (+9-79)
(modified) clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp (+102-143)
(modified) clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp (+3-3)
(modified) clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp (+1-1)
(modified) clang/unittests/CodeGen/CodeGenExternalTest.cpp (+2-3)
(modified) clang/unittests/Index/IndexTests.cpp (+1-1)
(modified) clang/unittests/Sema/HeuristicResolverTest.cpp (+19-13)
(modified) clang/unittests/StaticAnalyzer/SValTest.cpp (+5-8)
(modified) clang/unittests/Tooling/LookupTest.cpp (+9-9)
(modified) clang/unittests/Tooling/QualTypeNamesTest.cpp (+18-22)
(modified) clang/unittests/Tooling/RangeSelectorTest.cpp (+3-3)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp (+6-6)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp (+1-1)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp (+11-8)
(modified) clang/unittests/Tooling/RefactoringTest.cpp (+6-2)

diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index b74e183eec9cc..d319bee54aa6f 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -91,21 +91,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -114,12 +114,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -129,7 +129,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -138,12 +138,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -166,7 +166,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -183,7 +183,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -204,7 +204,7 @@ RESOURCE<float> Buffer;
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-LOAD-SAME: ' lvalue .__handle {{.*}}
-// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-LOAD-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-LOAD-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -220,7 +220,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -236,7 +236,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' -1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -254,7 +254,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -262,7 +262,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} 'element_type' ParmVar {{.*}} 'value' 'element_type'
 
@@ -279,7 +279,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -287,7 +287,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: IntegerLiteral {{.*}} 'int' -1
 
 // CHECK: ClassTemplateSpecializationDecl {{.*}} class [[RESOURCE]] definition
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index d098e5a323ca7..53e4b27c91dac 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -66,21 +66,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -89,12 +89,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -104,7 +104,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -113,12 +113,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -141,7 +141,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -158,7 +158,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -177,7 +177,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
diff --git a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
index 2f08531000f32..1c5e06789c3e4 100644
--- a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
+++ b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
@@ -63,9 +63,9 @@ namespace NS2 {
   // CHECK: HLSLBufferDecl {{.*}} line:[[# @LINE + 2]]:11 cbuffer CB2
   // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
   cbuffer CB2 {
-    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo':'hlsl_constant Foo'
+    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo'
     ::Foo foo0;
-    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo':'hlsl_constant NS2::Foo'
+    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo'
     Foo foo1;
     // CHECK: VarDecl {{.*}} foo2 'hlsl_constant NS1::Foo'
     NS1::Foo foo2;
diff --git a/clang/test/AST/HLSL/vector-constructors.hlsl b/clang/test/AST/HLSL/vector-constructors.hlsl
index 31d8dd0fdac8e..fd43a7dcbfcca 100644
--- a/clang/test/AST/HLSL/vector-constructors.hlsl
+++ b/clang/test/AST/HLSL/vector-constructors.hlsl
@@ -88,10 +88,10 @@ void entry() {
 // CHECK-NEXT: InitListExpr
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 
   struct T {
     operator float() const { return 1.0f; }
@@ -105,12 +105,12 @@ void entry() {
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <UserDefinedConversion>
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 
   typedef float2 second_level_of_typedefs;
   second_level_of_typedefs foo6 = float2(1.0f, 2.0f);
diff --git a/clang/test/AST/arm-mfp8.cpp b/clang/test/AST/arm-mfp8.cpp
index 195c734fc753e..b1fa04a3a79c1 100644
--- a/clang/test/AST/arm-mfp8.cpp
+++ b/clang/test/AST/arm-mfp8.cpp
@@ -49,7 +49,7 @@ class C1 {
   }
 };
 
-//CHECK:       | |-CXXRecordDecl {{.*}} referenced class C1
+//CHECK:       | |-CXXRecordDecl {{.*}} class C1
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f1c '__mfp8'
 //CHECK-NEXT:  | |-VarDecl {{.*}} f2c 'const __mfp8' static
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f3c 'volatile __mfp8'
diff --git a/clang/test/AST/ast-dump-color.cpp b/clang/test/AST/ast-dump-color.cpp
index 87797f6bffc5b..2e60e760283de 100644
--- a/clang/test/AST/ast-dump-color.cpp
+++ b/clang/test/AST/ast-dump-color.cpp
@@ -82,15 +82,15 @@ struct Invalid {
 //CHECK: {{^}}[[Blue]]| | `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'const Mutex &'[[RESET]]{{$}}
 //CHECK: {{^}}[[Blue]]| `-[[RESET]][[GREEN]]CXXConstructorDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] implicit constexpr[[CYAN]] Mutex[[RESET]] [[Green]]'void (Mutex &&)'[[RESET]] inline{{ .*$}}
 //CHECK: {{^}}[[Blue]]|   `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'Mutex &&'[[RESET]]{{$}}
-//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]VarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:1[[RESET]], [[Yellow]]line:25:3[[RESET]]> [[Yellow]]col:3[[RESET]] referenced[[CYAN]] mu1[[RESET]] [[Green]]'class Mutex':'Mutex'[[RESET]]
-//CHECK: {{^}}[[Blue]]| `-[[RESET]][[MAGENTA]]CXXConstructExpr[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:3[[RESET]]> [[Green]]'class Mutex...
[truncated]

llvmbot · 2025-07-10T17:56:53Z

@llvm/pr-subscribers-clang-modules

Author: Matheus Izvekov (mizvekov)

Changes

clang test changes

Second patch in the series, starting at #147835

Patch is 561.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/148014.diff

181 Files Affected:

(modified) clang/test/AST/HLSL/StructuredBuffers-AST.hlsl (+18-18)
(modified) clang/test/AST/HLSL/TypedBuffers-AST.hlsl (+12-12)
(modified) clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl (+2-2)
(modified) clang/test/AST/HLSL/vector-constructors.hlsl (+4-4)
(modified) clang/test/AST/arm-mfp8.cpp (+1-1)
(modified) clang/test/AST/ast-dump-color.cpp (+8-8)
(modified) clang/test/AST/ast-dump-ctad-alias.cpp (+11-12)
(modified) clang/test/AST/ast-dump-cxx2b-deducing-this.cpp (+1-1)
(modified) clang/test/AST/ast-dump-decl-json.c (-3)
(modified) clang/test/AST/ast-dump-decl.cpp (+19-19)
(modified) clang/test/AST/ast-dump-expr-json.cpp (-14)
(modified) clang/test/AST/ast-dump-expr.cpp (+2-5)
(modified) clang/test/AST/ast-dump-for-range-lifetime.cpp (+159-159)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp (+12-12)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_template_3.cpp (+1-1)
(modified) clang/test/AST/ast-dump-record-definition-data-json.cpp (-5)
(modified) clang/test/AST/ast-dump-records-json.cpp (-2)
(modified) clang/test/AST/ast-dump-records.c (+3-5)
(modified) clang/test/AST/ast-dump-records.cpp (+3-5)
(modified) clang/test/AST/ast-dump-recovery.cpp (+3-3)
(modified) clang/test/AST/ast-dump-stmt-json.cpp (+84-2)
(modified) clang/test/AST/ast-dump-stmt.m (+1-1)
(modified) clang/test/AST/ast-dump-template-decls.cpp (+1-2)
(modified) clang/test/AST/ast-dump-template-json-win32-mangler-crash.cpp (+45-67)
(modified) clang/test/AST/ast-dump-template-name.cpp (+22-25)
(modified) clang/test/AST/ast-dump-templates.cpp (+112-103)
(modified) clang/test/AST/ast-dump-traits.cpp (+2-3)
(modified) clang/test/AST/ast-dump-types-json.cpp (+45-32)
(modified) clang/test/AST/ast-dump-using-template.cpp (+17-21)
(modified) clang/test/AST/ast-dump-using.cpp (+7-9)
(modified) clang/test/AST/attr-swift_attr.m (+1-1)
(modified) clang/test/AST/coroutine-locals-cleanup.cpp (+2-2)
(modified) clang/test/AST/cxx2c-variadic-friends.cpp (+2-2)
(modified) clang/test/AST/deduction-guides.cpp (+9-9)
(modified) clang/test/AST/float16.cpp (+1-1)
(modified) clang/test/AST/sourceranges.cpp (+3-3)
(modified) clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp (+4-4)
(modified) clang/test/Analysis/anonymous-decls.cpp (+2-2)
(modified) clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp (+1-1)
(modified) clang/test/CXX/class.access/p6.cpp (+1-1)
(modified) clang/test/CXX/class.derived/class.derived.general/p2.cpp (+4-4)
(modified) clang/test/CXX/class/class.mem/class.mem.general/p8.cpp (+4-4)
(modified) clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p3.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-examples.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.meaning/dcl.mptr/p2.cpp (+1-1)
(modified) clang/test/CXX/dcl/dcl.fct/p17.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg0xx.cpp (+3-3)
(modified) clang/test/CXX/drs/cwg12xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg13xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg2149.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg26xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg28xx.cpp (+6-6)
(modified) clang/test/CXX/drs/cwg2xx.cpp (+5-5)
(modified) clang/test/CXX/drs/cwg3xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg4xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg6xx.cpp (+4-4)
(modified) clang/test/CXX/expr/expr.prim/expr.prim.req/compound-requirement.cpp (+1-1)
(modified) clang/test/CXX/over/over.match/over.match.funcs/over.match.class.deduct/p2.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.arg/temp.arg.nontype/p5.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.constr/temp.constr.decl/func-template-decl.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.decls/temp.class.spec/p6.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3-0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.param/p15-cxx0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.res/temp.dep/temp.dep.type/p4.cpp (+20-20)
(modified) clang/test/CodeGen/builtin-bpf-btf-type-id.c (+1-1)
(modified) clang/test/CodeGen/builtins-bpf-preserve-field-info-3.c (+1-1)
(modified) clang/test/Index/Core/index-instantiated-source.cpp (+2-2)
(modified) clang/test/Index/Core/index-source.cpp (+2-2)
(modified) clang/test/Index/c-index-api-loadTU-test.m (+1-1)
(modified) clang/test/Index/copy-assignment-operator.cpp (+2-2)
(modified) clang/test/Index/index-refs.cpp (+2-2)
(modified) clang/test/Index/keep-going.cpp (+2-2)
(modified) clang/test/Index/move-assignment-operator.cpp (+1-1)
(modified) clang/test/Index/opencl-types.cl (+8-8)
(modified) clang/test/Index/paren-type.c (+1-1)
(modified) clang/test/Index/print-type-size.cpp (+4-4)
(modified) clang/test/Index/print-type.c (+7-7)
(modified) clang/test/Index/print-type.cpp (+28-28)
(modified) clang/test/Index/recursive-cxx-member-calls.cpp (+10-10)
(modified) clang/test/Index/redeclarations.cpp (+1-1)
(modified) clang/test/Index/skip-parsed-bodies/compile_commands.json (+3-3)
(modified) clang/test/Misc/diag-template-diffing-cxx11.cpp (+4-4)
(modified) clang/test/Modules/modules-merge-enum.m (+10-14)
(modified) clang/test/Modules/odr_hash.cpp (+6-6)
(modified) clang/test/OpenMP/allocate_modifiers_messages.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_section_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/PCH/cxx-explicit-specifier.cpp (+3-3)
(modified) clang/test/Parser/MicrosoftExtensions.cpp (+1-1)
(modified) clang/test/Parser/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/MicrosoftExtensions.cpp (+4-4)
(modified) clang/test/SemaCXX/builtin-get-vtable-pointer.cpp (+1-1)
(modified) clang/test/SemaCXX/class-base-member-init.cpp (+1-1)
(modified) clang/test/SemaCXX/co_await-ast.cpp (+17-17)
(modified) clang/test/SemaCXX/compound-literal.cpp (+17-17)
(modified) clang/test/SemaCXX/constant-expression.cpp (+1-1)
(modified) clang/test/SemaCXX/constructor.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutine-allocs.cpp (+3-3)
(modified) clang/test/SemaCXX/coroutine-traits-undefined-template.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutines.cpp (+2-2)
(modified) clang/test/SemaCXX/ctad.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx1y-variable-templates_in_class.cpp (+5-5)
(modified) clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/cxx2a-destroying-delete.cpp (+1-1)
(modified) clang/test/SemaCXX/cxx2b-deducing-this.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx2c-variadic-friends.cpp (+1-1)
(modified) clang/test/SemaCXX/destructor.cpp (+3-3)
(modified) clang/test/SemaCXX/elaborated-type-specifier.cpp (+1-1)
(modified) clang/test/SemaCXX/enum-scoped.cpp (+1-1)
(modified) clang/test/SemaCXX/err_init_conversion_failed.cpp (+1-1)
(modified) clang/test/SemaCXX/gh102293.cpp (+1-1)
(modified) clang/test/SemaCXX/incomplete-call.cpp (+1-1)
(modified) clang/test/SemaCXX/matrix-casts.cpp (+2-2)
(modified) clang/test/SemaCXX/nested-name-spec.cpp (+5-3)
(modified) clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp (+2-2)
(modified) clang/test/SemaCXX/pseudo-destructors.cpp (+1-1)
(modified) clang/test/SemaCXX/return.cpp (+2-2)
(modified) clang/test/SemaCXX/static-assert.cpp (+1-1)
(modified) clang/test/SemaCXX/sugar-common-types.cpp (+3-2)
(modified) clang/test/SemaCXX/sugared-auto.cpp (+1-1)
(modified) clang/test/SemaCXX/type-aware-coroutines.cpp (+4-4)
(modified) clang/test/SemaCXX/undefined-partial-specialization.cpp (+1-1)
(modified) clang/test/SemaObjCXX/Inputs/nullability-pragmas-1.h (+1-1)
(modified) clang/test/SemaObjCXX/arc-bridged-cast.mm (+2-2)
(modified) clang/test/SemaObjCXX/objc-boxed-expressions-nsvalue.mm (+2-2)
(modified) clang/test/SemaObjCXX/objcbridge-attribute-arc.mm (+89-89)
(modified) clang/test/SemaObjCXX/objcbridge-attribute.mm (+90-90)
(modified) clang/test/SemaObjCXX/objcbridge-related-attribute.mm (+6-6)
(modified) clang/test/SemaObjCXX/objcbridge-static-cast.mm (+52-52)
(modified) clang/test/SemaOpenACC/combined-construct-num_workers-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-intexpr-clause-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-varlist-ast.cpp (+2-2)
(modified) clang/test/SemaTemplate/aggregate-deduction-candidate.cpp (+41-43)
(modified) clang/test/SemaTemplate/ctad.cpp (+4-4)
(modified) clang/test/SemaTemplate/current-instantiation.cpp (+1-1)
(modified) clang/test/SemaTemplate/deduction-crash.cpp (+2-2)
(modified) clang/test/SemaTemplate/deduction-guide.cpp (+46-50)
(modified) clang/test/SemaTemplate/dependent-base-classes.cpp (+5-5)
(modified) clang/test/SemaTemplate/dependent-names.cpp (+1-1)
(modified) clang/test/SemaTemplate/elaborated-type-specifier.cpp (+4-7)
(modified) clang/test/SemaTemplate/instantiate-requires-expr.cpp (+2-2)
(modified) clang/test/SemaTemplate/make_integer_seq.cpp (+78-84)
(modified) clang/test/SemaTemplate/ms-lookup-template-base-classes.cpp (+1-1)
(modified) clang/test/SemaTemplate/ms-sizeof-missing-typename.cpp (+6-6)
(modified) clang/test/SemaTemplate/nested-implicit-deduction-guides.cpp (+3-3)
(modified) clang/test/SemaTemplate/nested-name-spec-template.cpp (+1-1)
(modified) clang/test/SemaTemplate/nested-template.cpp (+2-2)
(modified) clang/test/SemaTemplate/overload-candidates.cpp (+6-6)
(modified) clang/test/SemaTemplate/temp_arg_nontype.cpp (+1-1)
(modified) clang/test/SemaTemplate/template-id-expr.cpp (+1-1)
(modified) clang/test/SemaTemplate/type_pack_element.cpp (+41-45)
(modified) clang/test/SemaTemplate/typename-specifier-4.cpp (+1-1)
(modified) clang/test/SemaTemplate/typename-specifier.cpp (+3-3)
(modified) clang/unittests/AST/ASTContextParentMapTest.cpp (+5-5)
(modified) clang/unittests/AST/ASTExprTest.cpp (+2-2)
(modified) clang/unittests/AST/ASTImporterFixtures.h (+1-2)
(modified) clang/unittests/AST/ASTImporterTest.cpp (+61-71)
(modified) clang/unittests/AST/DeclPrinterTest.cpp (+30-32)
(modified) clang/unittests/AST/ProfilingTest.cpp (+4-4)
(modified) clang/unittests/AST/RandstructTest.cpp (+1-1)
(modified) clang/unittests/AST/RecursiveASTVisitorTest.cpp (+3-2)
(modified) clang/unittests/AST/SizelessTypesTest.cpp (+1-1)
(modified) clang/unittests/AST/StructuralEquivalenceTest.cpp (+9-6)
(modified) clang/unittests/AST/TemplateNameTest.cpp (+6-7)
(modified) clang/unittests/AST/TypePrinterTest.cpp (+5-8)
(modified) clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp (+11-14)
(modified) clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp (+9-79)
(modified) clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp (+102-143)
(modified) clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp (+3-3)
(modified) clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp (+1-1)
(modified) clang/unittests/CodeGen/CodeGenExternalTest.cpp (+2-3)
(modified) clang/unittests/Index/IndexTests.cpp (+1-1)
(modified) clang/unittests/Sema/HeuristicResolverTest.cpp (+19-13)
(modified) clang/unittests/StaticAnalyzer/SValTest.cpp (+5-8)
(modified) clang/unittests/Tooling/LookupTest.cpp (+9-9)
(modified) clang/unittests/Tooling/QualTypeNamesTest.cpp (+18-22)
(modified) clang/unittests/Tooling/RangeSelectorTest.cpp (+3-3)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp (+6-6)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp (+1-1)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp (+11-8)
(modified) clang/unittests/Tooling/RefactoringTest.cpp (+6-2)

diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index b74e183eec9cc..d319bee54aa6f 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -91,21 +91,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -114,12 +114,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -129,7 +129,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -138,12 +138,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -166,7 +166,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -183,7 +183,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -204,7 +204,7 @@ RESOURCE<float> Buffer;
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-LOAD-SAME: ' lvalue .__handle {{.*}}
-// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-LOAD-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-LOAD-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -220,7 +220,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -236,7 +236,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' -1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -254,7 +254,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -262,7 +262,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} 'element_type' ParmVar {{.*}} 'value' 'element_type'
 
@@ -279,7 +279,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -287,7 +287,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: IntegerLiteral {{.*}} 'int' -1
 
 // CHECK: ClassTemplateSpecializationDecl {{.*}} class [[RESOURCE]] definition
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index d098e5a323ca7..53e4b27c91dac 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -66,21 +66,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -89,12 +89,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -104,7 +104,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -113,12 +113,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -141,7 +141,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -158,7 +158,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -177,7 +177,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
diff --git a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
index 2f08531000f32..1c5e06789c3e4 100644
--- a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
+++ b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
@@ -63,9 +63,9 @@ namespace NS2 {
   // CHECK: HLSLBufferDecl {{.*}} line:[[# @LINE + 2]]:11 cbuffer CB2
   // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
   cbuffer CB2 {
-    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo':'hlsl_constant Foo'
+    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo'
     ::Foo foo0;
-    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo':'hlsl_constant NS2::Foo'
+    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo'
     Foo foo1;
     // CHECK: VarDecl {{.*}} foo2 'hlsl_constant NS1::Foo'
     NS1::Foo foo2;
diff --git a/clang/test/AST/HLSL/vector-constructors.hlsl b/clang/test/AST/HLSL/vector-constructors.hlsl
index 31d8dd0fdac8e..fd43a7dcbfcca 100644
--- a/clang/test/AST/HLSL/vector-constructors.hlsl
+++ b/clang/test/AST/HLSL/vector-constructors.hlsl
@@ -88,10 +88,10 @@ void entry() {
 // CHECK-NEXT: InitListExpr
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 
   struct T {
     operator float() const { return 1.0f; }
@@ -105,12 +105,12 @@ void entry() {
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <UserDefinedConversion>
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 
   typedef float2 second_level_of_typedefs;
   second_level_of_typedefs foo6 = float2(1.0f, 2.0f);
diff --git a/clang/test/AST/arm-mfp8.cpp b/clang/test/AST/arm-mfp8.cpp
index 195c734fc753e..b1fa04a3a79c1 100644
--- a/clang/test/AST/arm-mfp8.cpp
+++ b/clang/test/AST/arm-mfp8.cpp
@@ -49,7 +49,7 @@ class C1 {
   }
 };
 
-//CHECK:       | |-CXXRecordDecl {{.*}} referenced class C1
+//CHECK:       | |-CXXRecordDecl {{.*}} class C1
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f1c '__mfp8'
 //CHECK-NEXT:  | |-VarDecl {{.*}} f2c 'const __mfp8' static
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f3c 'volatile __mfp8'
diff --git a/clang/test/AST/ast-dump-color.cpp b/clang/test/AST/ast-dump-color.cpp
index 87797f6bffc5b..2e60e760283de 100644
--- a/clang/test/AST/ast-dump-color.cpp
+++ b/clang/test/AST/ast-dump-color.cpp
@@ -82,15 +82,15 @@ struct Invalid {
 //CHECK: {{^}}[[Blue]]| | `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'const Mutex &'[[RESET]]{{$}}
 //CHECK: {{^}}[[Blue]]| `-[[RESET]][[GREEN]]CXXConstructorDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] implicit constexpr[[CYAN]] Mutex[[RESET]] [[Green]]'void (Mutex &&)'[[RESET]] inline{{ .*$}}
 //CHECK: {{^}}[[Blue]]|   `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'Mutex &&'[[RESET]]{{$}}
-//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]VarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:1[[RESET]], [[Yellow]]line:25:3[[RESET]]> [[Yellow]]col:3[[RESET]] referenced[[CYAN]] mu1[[RESET]] [[Green]]'class Mutex':'Mutex'[[RESET]]
-//CHECK: {{^}}[[Blue]]| `-[[RESET]][[MAGENTA]]CXXConstructExpr[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:3[[RESET]]> [[Green]]'class Mutex...
[truncated]

llvmbot · 2025-07-10T17:56:53Z

@llvm/pr-subscribers-clang-static-analyzer-1

Author: Matheus Izvekov (mizvekov)

Changes

clang test changes

Second patch in the series, starting at #147835

Patch is 561.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/148014.diff

181 Files Affected:

(modified) clang/test/AST/HLSL/StructuredBuffers-AST.hlsl (+18-18)
(modified) clang/test/AST/HLSL/TypedBuffers-AST.hlsl (+12-12)
(modified) clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl (+2-2)
(modified) clang/test/AST/HLSL/vector-constructors.hlsl (+4-4)
(modified) clang/test/AST/arm-mfp8.cpp (+1-1)
(modified) clang/test/AST/ast-dump-color.cpp (+8-8)
(modified) clang/test/AST/ast-dump-ctad-alias.cpp (+11-12)
(modified) clang/test/AST/ast-dump-cxx2b-deducing-this.cpp (+1-1)
(modified) clang/test/AST/ast-dump-decl-json.c (-3)
(modified) clang/test/AST/ast-dump-decl.cpp (+19-19)
(modified) clang/test/AST/ast-dump-expr-json.cpp (-14)
(modified) clang/test/AST/ast-dump-expr.cpp (+2-5)
(modified) clang/test/AST/ast-dump-for-range-lifetime.cpp (+159-159)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_reference.cpp (+12-12)
(modified) clang/test/AST/ast-dump-openmp-begin-declare-variant_template_3.cpp (+1-1)
(modified) clang/test/AST/ast-dump-record-definition-data-json.cpp (-5)
(modified) clang/test/AST/ast-dump-records-json.cpp (-2)
(modified) clang/test/AST/ast-dump-records.c (+3-5)
(modified) clang/test/AST/ast-dump-records.cpp (+3-5)
(modified) clang/test/AST/ast-dump-recovery.cpp (+3-3)
(modified) clang/test/AST/ast-dump-stmt-json.cpp (+84-2)
(modified) clang/test/AST/ast-dump-stmt.m (+1-1)
(modified) clang/test/AST/ast-dump-template-decls.cpp (+1-2)
(modified) clang/test/AST/ast-dump-template-json-win32-mangler-crash.cpp (+45-67)
(modified) clang/test/AST/ast-dump-template-name.cpp (+22-25)
(modified) clang/test/AST/ast-dump-templates.cpp (+112-103)
(modified) clang/test/AST/ast-dump-traits.cpp (+2-3)
(modified) clang/test/AST/ast-dump-types-json.cpp (+45-32)
(modified) clang/test/AST/ast-dump-using-template.cpp (+17-21)
(modified) clang/test/AST/ast-dump-using.cpp (+7-9)
(modified) clang/test/AST/attr-swift_attr.m (+1-1)
(modified) clang/test/AST/coroutine-locals-cleanup.cpp (+2-2)
(modified) clang/test/AST/cxx2c-variadic-friends.cpp (+2-2)
(modified) clang/test/AST/deduction-guides.cpp (+9-9)
(modified) clang/test/AST/float16.cpp (+1-1)
(modified) clang/test/AST/sourceranges.cpp (+3-3)
(modified) clang/test/ASTSYCL/ast-dump-sycl-kernel-call-stmt.cpp (+4-4)
(modified) clang/test/Analysis/anonymous-decls.cpp (+2-2)
(modified) clang/test/CXX/basic/basic.lookup/basic.lookup.qual/class.qual/p2.cpp (+1-1)
(modified) clang/test/CXX/class.access/p6.cpp (+1-1)
(modified) clang/test/CXX/class.derived/class.derived.general/p2.cpp (+4-4)
(modified) clang/test/CXX/class/class.mem/class.mem.general/p8.cpp (+4-4)
(modified) clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/dcl.type.elab/p3.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.init/dcl.init.ref/p5-examples.cpp (+1-1)
(modified) clang/test/CXX/dcl.decl/dcl.meaning/dcl.mptr/p2.cpp (+1-1)
(modified) clang/test/CXX/dcl/dcl.fct/p17.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg0xx.cpp (+3-3)
(modified) clang/test/CXX/drs/cwg12xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg13xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg2149.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg26xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg28xx.cpp (+6-6)
(modified) clang/test/CXX/drs/cwg2xx.cpp (+5-5)
(modified) clang/test/CXX/drs/cwg3xx.cpp (+4-4)
(modified) clang/test/CXX/drs/cwg4xx.cpp (+1-1)
(modified) clang/test/CXX/drs/cwg6xx.cpp (+4-4)
(modified) clang/test/CXX/expr/expr.prim/expr.prim.req/compound-requirement.cpp (+1-1)
(modified) clang/test/CXX/over/over.match/over.match.funcs/over.match.class.deduct/p2.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.arg/temp.arg.nontype/p5.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.constr/temp.constr.decl/func-template-decl.cpp (+1-1)
(modified) clang/test/CXX/temp/temp.decls/temp.class.spec/p6.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.call/p3-0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.param/p15-cxx0x.cpp (+2-2)
(modified) clang/test/CXX/temp/temp.res/temp.dep/temp.dep.type/p4.cpp (+20-20)
(modified) clang/test/CodeGen/builtin-bpf-btf-type-id.c (+1-1)
(modified) clang/test/CodeGen/builtins-bpf-preserve-field-info-3.c (+1-1)
(modified) clang/test/Index/Core/index-instantiated-source.cpp (+2-2)
(modified) clang/test/Index/Core/index-source.cpp (+2-2)
(modified) clang/test/Index/c-index-api-loadTU-test.m (+1-1)
(modified) clang/test/Index/copy-assignment-operator.cpp (+2-2)
(modified) clang/test/Index/index-refs.cpp (+2-2)
(modified) clang/test/Index/keep-going.cpp (+2-2)
(modified) clang/test/Index/move-assignment-operator.cpp (+1-1)
(modified) clang/test/Index/opencl-types.cl (+8-8)
(modified) clang/test/Index/paren-type.c (+1-1)
(modified) clang/test/Index/print-type-size.cpp (+4-4)
(modified) clang/test/Index/print-type.c (+7-7)
(modified) clang/test/Index/print-type.cpp (+28-28)
(modified) clang/test/Index/recursive-cxx-member-calls.cpp (+10-10)
(modified) clang/test/Index/redeclarations.cpp (+1-1)
(modified) clang/test/Index/skip-parsed-bodies/compile_commands.json (+3-3)
(modified) clang/test/Misc/diag-template-diffing-cxx11.cpp (+4-4)
(modified) clang/test/Modules/modules-merge-enum.m (+10-14)
(modified) clang/test/Modules/odr_hash.cpp (+6-6)
(modified) clang/test/OpenMP/allocate_modifiers_messages.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/OpenMP/target_map_array_section_of_structs_with_nested_mapper_ast_dump.cpp (+1-1)
(modified) clang/test/PCH/cxx-explicit-specifier.cpp (+3-3)
(modified) clang/test/Parser/MicrosoftExtensions.cpp (+1-1)
(modified) clang/test/Parser/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/MicrosoftExtensions.cpp (+4-4)
(modified) clang/test/SemaCXX/builtin-get-vtable-pointer.cpp (+1-1)
(modified) clang/test/SemaCXX/class-base-member-init.cpp (+1-1)
(modified) clang/test/SemaCXX/co_await-ast.cpp (+17-17)
(modified) clang/test/SemaCXX/compound-literal.cpp (+17-17)
(modified) clang/test/SemaCXX/constant-expression.cpp (+1-1)
(modified) clang/test/SemaCXX/constructor.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutine-allocs.cpp (+3-3)
(modified) clang/test/SemaCXX/coroutine-traits-undefined-template.cpp (+1-1)
(modified) clang/test/SemaCXX/coroutines.cpp (+2-2)
(modified) clang/test/SemaCXX/ctad.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx1y-variable-templates_in_class.cpp (+5-5)
(modified) clang/test/SemaCXX/cxx1z-class-template-argument-deduction.cpp (+3-3)
(modified) clang/test/SemaCXX/cxx2a-destroying-delete.cpp (+1-1)
(modified) clang/test/SemaCXX/cxx2b-deducing-this.cpp (+2-2)
(modified) clang/test/SemaCXX/cxx2c-variadic-friends.cpp (+1-1)
(modified) clang/test/SemaCXX/destructor.cpp (+3-3)
(modified) clang/test/SemaCXX/elaborated-type-specifier.cpp (+1-1)
(modified) clang/test/SemaCXX/enum-scoped.cpp (+1-1)
(modified) clang/test/SemaCXX/err_init_conversion_failed.cpp (+1-1)
(modified) clang/test/SemaCXX/gh102293.cpp (+1-1)
(modified) clang/test/SemaCXX/incomplete-call.cpp (+1-1)
(modified) clang/test/SemaCXX/matrix-casts.cpp (+2-2)
(modified) clang/test/SemaCXX/nested-name-spec.cpp (+5-3)
(modified) clang/test/SemaCXX/pointer-forward-declared-class-conversion.cpp (+2-2)
(modified) clang/test/SemaCXX/pseudo-destructors.cpp (+1-1)
(modified) clang/test/SemaCXX/return.cpp (+2-2)
(modified) clang/test/SemaCXX/static-assert.cpp (+1-1)
(modified) clang/test/SemaCXX/sugar-common-types.cpp (+3-2)
(modified) clang/test/SemaCXX/sugared-auto.cpp (+1-1)
(modified) clang/test/SemaCXX/type-aware-coroutines.cpp (+4-4)
(modified) clang/test/SemaCXX/undefined-partial-specialization.cpp (+1-1)
(modified) clang/test/SemaObjCXX/Inputs/nullability-pragmas-1.h (+1-1)
(modified) clang/test/SemaObjCXX/arc-bridged-cast.mm (+2-2)
(modified) clang/test/SemaObjCXX/objc-boxed-expressions-nsvalue.mm (+2-2)
(modified) clang/test/SemaObjCXX/objcbridge-attribute-arc.mm (+89-89)
(modified) clang/test/SemaObjCXX/objcbridge-attribute.mm (+90-90)
(modified) clang/test/SemaObjCXX/objcbridge-related-attribute.mm (+6-6)
(modified) clang/test/SemaObjCXX/objcbridge-static-cast.mm (+52-52)
(modified) clang/test/SemaOpenACC/combined-construct-num_workers-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-intexpr-clause-ast.cpp (+1-1)
(modified) clang/test/SemaOpenACC/compute-construct-varlist-ast.cpp (+2-2)
(modified) clang/test/SemaTemplate/aggregate-deduction-candidate.cpp (+41-43)
(modified) clang/test/SemaTemplate/ctad.cpp (+4-4)
(modified) clang/test/SemaTemplate/current-instantiation.cpp (+1-1)
(modified) clang/test/SemaTemplate/deduction-crash.cpp (+2-2)
(modified) clang/test/SemaTemplate/deduction-guide.cpp (+46-50)
(modified) clang/test/SemaTemplate/dependent-base-classes.cpp (+5-5)
(modified) clang/test/SemaTemplate/dependent-names.cpp (+1-1)
(modified) clang/test/SemaTemplate/elaborated-type-specifier.cpp (+4-7)
(modified) clang/test/SemaTemplate/instantiate-requires-expr.cpp (+2-2)
(modified) clang/test/SemaTemplate/make_integer_seq.cpp (+78-84)
(modified) clang/test/SemaTemplate/ms-lookup-template-base-classes.cpp (+1-1)
(modified) clang/test/SemaTemplate/ms-sizeof-missing-typename.cpp (+6-6)
(modified) clang/test/SemaTemplate/nested-implicit-deduction-guides.cpp (+3-3)
(modified) clang/test/SemaTemplate/nested-name-spec-template.cpp (+1-1)
(modified) clang/test/SemaTemplate/nested-template.cpp (+2-2)
(modified) clang/test/SemaTemplate/overload-candidates.cpp (+6-6)
(modified) clang/test/SemaTemplate/temp_arg_nontype.cpp (+1-1)
(modified) clang/test/SemaTemplate/template-id-expr.cpp (+1-1)
(modified) clang/test/SemaTemplate/type_pack_element.cpp (+41-45)
(modified) clang/test/SemaTemplate/typename-specifier-4.cpp (+1-1)
(modified) clang/test/SemaTemplate/typename-specifier.cpp (+3-3)
(modified) clang/unittests/AST/ASTContextParentMapTest.cpp (+5-5)
(modified) clang/unittests/AST/ASTExprTest.cpp (+2-2)
(modified) clang/unittests/AST/ASTImporterFixtures.h (+1-2)
(modified) clang/unittests/AST/ASTImporterTest.cpp (+61-71)
(modified) clang/unittests/AST/DeclPrinterTest.cpp (+30-32)
(modified) clang/unittests/AST/ProfilingTest.cpp (+4-4)
(modified) clang/unittests/AST/RandstructTest.cpp (+1-1)
(modified) clang/unittests/AST/RecursiveASTVisitorTest.cpp (+3-2)
(modified) clang/unittests/AST/SizelessTypesTest.cpp (+1-1)
(modified) clang/unittests/AST/StructuralEquivalenceTest.cpp (+9-6)
(modified) clang/unittests/AST/TemplateNameTest.cpp (+6-7)
(modified) clang/unittests/AST/TypePrinterTest.cpp (+5-8)
(modified) clang/unittests/ASTMatchers/ASTMatchersNarrowingTest.cpp (+11-14)
(modified) clang/unittests/ASTMatchers/ASTMatchersNodeTest.cpp (+9-79)
(modified) clang/unittests/ASTMatchers/ASTMatchersTraversalTest.cpp (+102-143)
(modified) clang/unittests/Analysis/FlowSensitive/CachedConstAccessorsLatticeTest.cpp (+3-3)
(modified) clang/unittests/Analysis/FlowSensitive/DataflowEnvironmentTest.cpp (+1-1)
(modified) clang/unittests/CodeGen/CodeGenExternalTest.cpp (+2-3)
(modified) clang/unittests/Index/IndexTests.cpp (+1-1)
(modified) clang/unittests/Sema/HeuristicResolverTest.cpp (+19-13)
(modified) clang/unittests/StaticAnalyzer/SValTest.cpp (+5-8)
(modified) clang/unittests/Tooling/LookupTest.cpp (+9-9)
(modified) clang/unittests/Tooling/QualTypeNamesTest.cpp (+18-22)
(modified) clang/unittests/Tooling/RangeSelectorTest.cpp (+3-3)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTestTypeLocVisitor.cpp (+6-6)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/MemberPointerTypeLoc.cpp (+1-1)
(modified) clang/unittests/Tooling/RecursiveASTVisitorTests/NestedNameSpecifiers.cpp (+11-8)
(modified) clang/unittests/Tooling/RefactoringTest.cpp (+6-2)

diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index b74e183eec9cc..d319bee54aa6f 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -91,21 +91,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -114,12 +114,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -129,7 +129,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -138,12 +138,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -166,7 +166,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -183,7 +183,7 @@ RESOURCE<float> Buffer;
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
-// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -204,7 +204,7 @@ RESOURCE<float> Buffer;
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
 // CHECK-LOAD-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-LOAD-SAME: ' lvalue .__handle {{.*}}
-// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-LOAD-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
 // CHECK-LOAD-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -220,7 +220,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -236,7 +236,7 @@ RESOURCE<float> Buffer;
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
+// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
 // CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' -1
 // CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -254,7 +254,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -262,7 +262,7 @@ RESOURCE<float> Buffer;
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-APPEND-NEXT: IntegerLiteral {{.*}} 'int' 1
 // CHECK-APPEND-NEXT: DeclRefExpr {{.*}} 'element_type' ParmVar {{.*}} 'value' 'element_type'
 
@@ -279,7 +279,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: CallExpr {{.*}} 'unsigned int'
 // CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
@@ -287,7 +287,7 @@ RESOURCE<float> Buffer;
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
 // CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
-// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-CONSUME-NEXT: IntegerLiteral {{.*}} 'int' -1
 
 // CHECK: ClassTemplateSpecializationDecl {{.*}} class [[RESOURCE]] definition
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index d098e5a323ca7..53e4b27c91dac 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -66,21 +66,21 @@ RESOURCE<float> Buffer;
 
 // Default constructor
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
 // CHECK-NEXT: CompoundStmt
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: AlwaysInlineAttr
 
 // Constructor from binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -89,12 +89,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -104,7 +104,7 @@ RESOURCE<float> Buffer;
 
 // Constructor from implicit binding
 
-// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
+// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
 // CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
 // CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
 // CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -113,12 +113,12 @@ RESOURCE<float> Buffer;
 // CHECK-NEXT: CompoundStmt {{.*}}
 // CHECK-NEXT: BinaryOperator {{.*}} '='
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
 // CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
 // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
 // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -141,7 +141,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -158,7 +158,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
@@ -177,7 +177,7 @@ RESOURCE<float> Buffer;
 // CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
 // CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
 // CHECK-SAME: ' lvalue .__handle {{.*}}
-// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
+// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
 // CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}}  'Index' 'unsigned int'
 // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
 
diff --git a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
index 2f08531000f32..1c5e06789c3e4 100644
--- a/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
+++ b/clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl
@@ -63,9 +63,9 @@ namespace NS2 {
   // CHECK: HLSLBufferDecl {{.*}} line:[[# @LINE + 2]]:11 cbuffer CB2
   // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
   cbuffer CB2 {
-    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo':'hlsl_constant Foo'
+    // CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo'
     ::Foo foo0;
-    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo':'hlsl_constant NS2::Foo'
+    // CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo'
     Foo foo1;
     // CHECK: VarDecl {{.*}} foo2 'hlsl_constant NS1::Foo'
     NS1::Foo foo2;
diff --git a/clang/test/AST/HLSL/vector-constructors.hlsl b/clang/test/AST/HLSL/vector-constructors.hlsl
index 31d8dd0fdac8e..fd43a7dcbfcca 100644
--- a/clang/test/AST/HLSL/vector-constructors.hlsl
+++ b/clang/test/AST/HLSL/vector-constructors.hlsl
@@ -88,10 +88,10 @@ void entry() {
 // CHECK-NEXT: InitListExpr
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
 // CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
 
   struct T {
     operator float() const { return 1.0f; }
@@ -105,12 +105,12 @@ void entry() {
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <UserDefinedConversion>
 // CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
 // CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
-// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
+// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
 
   typedef float2 second_level_of_typedefs;
   second_level_of_typedefs foo6 = float2(1.0f, 2.0f);
diff --git a/clang/test/AST/arm-mfp8.cpp b/clang/test/AST/arm-mfp8.cpp
index 195c734fc753e..b1fa04a3a79c1 100644
--- a/clang/test/AST/arm-mfp8.cpp
+++ b/clang/test/AST/arm-mfp8.cpp
@@ -49,7 +49,7 @@ class C1 {
   }
 };
 
-//CHECK:       | |-CXXRecordDecl {{.*}} referenced class C1
+//CHECK:       | |-CXXRecordDecl {{.*}} class C1
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f1c '__mfp8'
 //CHECK-NEXT:  | |-VarDecl {{.*}} f2c 'const __mfp8' static
 //CHECK-NEXT:  | |-FieldDecl {{.*}} f3c 'volatile __mfp8'
diff --git a/clang/test/AST/ast-dump-color.cpp b/clang/test/AST/ast-dump-color.cpp
index 87797f6bffc5b..2e60e760283de 100644
--- a/clang/test/AST/ast-dump-color.cpp
+++ b/clang/test/AST/ast-dump-color.cpp
@@ -82,15 +82,15 @@ struct Invalid {
 //CHECK: {{^}}[[Blue]]| | `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'const Mutex &'[[RESET]]{{$}}
 //CHECK: {{^}}[[Blue]]| `-[[RESET]][[GREEN]]CXXConstructorDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] implicit constexpr[[CYAN]] Mutex[[RESET]] [[Green]]'void (Mutex &&)'[[RESET]] inline{{ .*$}}
 //CHECK: {{^}}[[Blue]]|   `-[[RESET]][[GREEN]]ParmVarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:33[[RESET]]> [[Yellow]]col:33[[RESET]] [[Green]]'Mutex &&'[[RESET]]{{$}}
-//CHECK: {{^}}[[Blue]]|-[[RESET]][[GREEN]]VarDecl[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:1[[RESET]], [[Yellow]]line:25:3[[RESET]]> [[Yellow]]col:3[[RESET]] referenced[[CYAN]] mu1[[RESET]] [[Green]]'class Mutex':'Mutex'[[RESET]]
-//CHECK: {{^}}[[Blue]]| `-[[RESET]][[MAGENTA]]CXXConstructExpr[[RESET]][[Yellow]] 0x{{[0-9a-fA-F]*}}[[RESET]] <[[Yellow]]col:3[[RESET]]> [[Green]]'class Mutex...
[truncated]

clang test changes

mizvekov requested review from cor3ntin, shafik, erichkeane, Sirraide and zyn0217 July 10, 2025 17:56

mizvekov self-assigned this Jul 10, 2025

mizvekov requested a review from Endilll as a code owner July 10, 2025 17:56

This was referenced Jul 10, 2025

[PATCH 4/4] [clang] Improve nested name specifier AST representation #148015

Open

[PATCH 1/4] [clang] Improve nested name specifier AST representation #147835

Open

mizvekov force-pushed the users/mizvekov/name-qualification-refactor-3 branch from 3a1520a to 71e1f76 Compare July 10, 2025 20:14

mizvekov force-pushed the users/mizvekov/name-qualification-refactor-2 branch from 1aae9f7 to ddaea06 Compare July 10, 2025 20:14

[PATCH 3/4] [clang] Improve nested name specifier AST representation

4891b52

clang test changes

mizvekov force-pushed the users/mizvekov/name-qualification-refactor-3 branch from 71e1f76 to 4891b52 Compare July 11, 2025 00:05

mizvekov force-pushed the users/mizvekov/name-qualification-refactor-2 branch from ddaea06 to b16b022 Compare July 11, 2025 00:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[PATCH 3/4] [clang] Improve nested name specifier AST representation #148014

[PATCH 3/4] [clang] Improve nested name specifier AST representation #148014

mizvekov commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

Uh oh!

[PATCH 3/4] [clang] Improve nested name specifier AST representation #148014

Are you sure you want to change the base?

[PATCH 3/4] [clang] Improve nested name specifier AST representation #148014

Conversation

mizvekov commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

llvmbot commented Jul 10, 2025

Uh oh!

Uh oh!