Skip to content

Commit fb1fdfd

Browse files
mizvekovmizvekov
committed
[PATCH 3/6] [clang] Improve nested name specifier AST representation
clang test changes
1 parent 365a333 commit fb1fdfd

File tree

176 files changed

+1658
-1749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+1658
-1749
lines changed

‎clang/test/AST/HLSL/StructuredBuffers-AST.hlsl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,21 @@ RESOURCE<float> Buffer;
9191

9292
// Default constructor
9393

94-
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
94+
// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
9595
// CHECK-NEXT: CompoundStmt
9696
// CHECK-NEXT: BinaryOperator {{.*}} '='
9797
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
98-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
98+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
9999
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
100100
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
101101
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
102102
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
103-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
103+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
104104
// CHECK-NEXT: AlwaysInlineAttr
105105

106106
// Constructor from binding
107107

108-
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
108+
// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
109109
// CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
110110
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
111111
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -114,12 +114,12 @@ RESOURCE<float> Buffer;
114114
// CHECK-NEXT: CompoundStmt {{.*}}
115115
// CHECK-NEXT: BinaryOperator {{.*}} '='
116116
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
117-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
117+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
118118
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
119119
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
120120
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
121121
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
122-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
122+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
123123
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
124124
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
125125
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -129,7 +129,7 @@ RESOURCE<float> Buffer;
129129

130130
// Constructor from implicit binding
131131

132-
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
132+
// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
133133
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
134134
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
135135
// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -138,12 +138,12 @@ RESOURCE<float> Buffer;
138138
// CHECK-NEXT: CompoundStmt {{.*}}
139139
// CHECK-NEXT: BinaryOperator {{.*}} '='
140140
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
141-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
141+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
142142
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
143143
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
144144
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
145145
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
146-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
146+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
147147
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
148148
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
149149
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -166,7 +166,7 @@ RESOURCE<float> Buffer;
166166
// CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::raw_buffer]]
167167
// CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
168168
// CHECK-SUBSCRIPT-SAME: ' lvalue .__handle {{.*}}
169-
// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
169+
// CHECK-SUBSCRIPT-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
170170
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
171171
// CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
172172

@@ -183,7 +183,7 @@ RESOURCE<float> Buffer;
183183
// CHECK-SUBSCRIPT-UAV-SAME{LITERAL}: [[hlsl::raw_buffer]]
184184
// CHECK-SUBSCRIPT-UAV-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
185185
// CHECK-SUBSCRIPT-UAV-SAME: ' lvalue .__handle {{.*}}
186-
// CHECK-SUBSCRIPT-UAV-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
186+
// CHECK-SUBSCRIPT-UAV-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
187187
// CHECK-SUBSCRIPT-UAV-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
188188
// CHECK-SUBSCRIPT-UAV-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
189189

@@ -204,7 +204,7 @@ RESOURCE<float> Buffer;
204204
// CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
205205
// CHECK-LOAD-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
206206
// CHECK-LOAD-SAME: ' lvalue .__handle {{.*}}
207-
// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
207+
// CHECK-LOAD-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
208208
// CHECK-LOAD-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
209209
// CHECK-LOAD-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
210210

@@ -220,7 +220,7 @@ RESOURCE<float> Buffer;
220220
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
221221
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
222222
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
223-
// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
223+
// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
224224
// CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' 1
225225
// CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
226226

@@ -236,7 +236,7 @@ RESOURCE<float> Buffer;
236236
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
237237
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::raw_buffer]]
238238
// CHECK-COUNTER-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
239-
// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'RWStructuredBuffer<element_type>' lvalue implicit this
239+
// CHECK-COUNTER-NEXT: CXXThisExpr {{.*}} 'hlsl::RWStructuredBuffer<element_type>' lvalue implicit this
240240
// CHECK-COUNTER-NEXT: IntegerLiteral {{.*}} 'int' -1
241241
// CHECK-COUNTER-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
242242

@@ -254,15 +254,15 @@ RESOURCE<float> Buffer;
254254
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
255255
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
256256
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
257-
// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
257+
// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
258258
// CHECK-APPEND-NEXT: CallExpr {{.*}} 'unsigned int'
259259
// CHECK-APPEND-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
260260
// CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
261261
// CHECK-APPEND-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
262262
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
263263
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::raw_buffer]]
264264
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
265-
// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
265+
// CHECK-APPEND-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
266266
// CHECK-APPEND-NEXT: IntegerLiteral {{.*}} 'int' 1
267267
// CHECK-APPEND-NEXT: DeclRefExpr {{.*}} 'element_type' ParmVar {{.*}} 'value' 'element_type'
268268

@@ -279,15 +279,15 @@ RESOURCE<float> Buffer;
279279
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
280280
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
281281
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
282-
// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
282+
// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
283283
// CHECK-CONSUME-NEXT: CallExpr {{.*}} 'unsigned int'
284284
// CHECK-CONSUME-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
285285
// CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_buffer_update_counter' 'unsigned int (...) noexcept'
286286
// CHECK-CONSUME-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
287287
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
288288
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::raw_buffer]]
289289
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]' lvalue .__handle
290-
// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
290+
// CHECK-CONSUME-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
291291
// CHECK-CONSUME-NEXT: IntegerLiteral {{.*}} 'int' -1
292292

293293
// CHECK: ClassTemplateSpecializationDecl {{.*}} class [[RESOURCE]] definition

‎clang/test/AST/HLSL/TypedBuffers-AST.hlsl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ RESOURCE<float> Buffer;
6666

6767
// Default constructor
6868

69-
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void ()' inline
69+
// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void ()' inline
7070
// CHECK-NEXT: CompoundStmt
7171
// CHECK-NEXT: BinaryOperator {{.*}} '='
7272
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
73-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
73+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
7474
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
7575
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
7676
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
7777
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
78-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
78+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
7979
// CHECK-NEXT: AlwaysInlineAttr
8080

8181
// Constructor from binding
8282

83-
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
83+
// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, unsigned int, int, unsigned int, const char *)' inline
8484
// CHECK-NEXT: ParmVarDecl {{.*}} registerNo 'unsigned int'
8585
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
8686
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
@@ -89,12 +89,12 @@ RESOURCE<float> Buffer;
8989
// CHECK-NEXT: CompoundStmt {{.*}}
9090
// CHECK-NEXT: BinaryOperator {{.*}} '='
9191
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
92-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
92+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
9393
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
9494
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
9595
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
9696
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
97-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
97+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
9898
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'
9999
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
100100
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
@@ -104,7 +104,7 @@ RESOURCE<float> Buffer;
104104

105105
// Constructor from implicit binding
106106

107-
// CHECK: CXXConstructorDecl {{.*}} [[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
107+
// CHECK: CXXConstructorDecl {{.*}} hlsl::[[RESOURCE]]<element_type> 'void (unsigned int, int, unsigned int, unsigned int, const char *)' inline
108108
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
109109
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
110110
// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
@@ -113,12 +113,12 @@ RESOURCE<float> Buffer;
113113
// CHECK-NEXT: CompoundStmt {{.*}}
114114
// CHECK-NEXT: BinaryOperator {{.*}} '='
115115
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
116-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
116+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
117117
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
118118
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
119119
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding'
120120
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
121-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
121+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
122122
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
123123
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
124124
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
@@ -141,7 +141,7 @@ RESOURCE<float> Buffer;
141141
// CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
142142
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
143143
// CHECK-SAME: ' lvalue .__handle {{.*}}
144-
// CHECK-NEXT: CXXThisExpr {{.*}} 'const [[RESOURCE]]<element_type>' lvalue implicit this
144+
// CHECK-NEXT: CXXThisExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
145145
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
146146
// CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
147147

@@ -157,7 +157,7 @@ RESOURCE<float> Buffer;
157157
// CHECK-UAV-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
158158
// CHECK-UAV-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
159159
// CHECK-UAV-SAME: ' lvalue .__handle {{.*}}
160-
// CHECK-UAV-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
160+
// CHECK-UAV-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
161161
// CHECK-UAV-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
162162
// CHECK-UAV-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
163163

@@ -176,7 +176,7 @@ RESOURCE<float> Buffer;
176176
// CHECK-SRV-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
177177
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
178178
// CHECK-SAME: ' lvalue .__handle {{.*}}
179-
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
179+
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this
180180
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
181181
// CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
182182

‎clang/test/AST/HLSL/cbuffer_and_namespaces.hlsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ namespace NS2 {
6363
// CHECK: HLSLBufferDecl {{.*}} line:[[# @LINE + 2]]:11 cbuffer CB2
6464
// CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
6565
cbuffer CB2 {
66-
// CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo':'hlsl_constant Foo'
66+
// CHECK: VarDecl {{.*}} foo0 'hlsl_constant ::Foo'
6767
::Foo foo0;
68-
// CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo':'hlsl_constant NS2::Foo'
68+
// CHECK: VarDecl {{.*}} foo1 'hlsl_constant Foo'
6969
Foo foo1;
7070
// CHECK: VarDecl {{.*}} foo2 'hlsl_constant NS1::Foo'
7171
NS1::Foo foo2;

‎clang/test/AST/HLSL/vector-constructors.hlsl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ void entry() {
8888
// CHECK-NEXT: InitListExpr
8989
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
9090
// CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
91-
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
91+
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
9292
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
9393
// CHECK-NEXT: MemberExpr {{.*}} 'float' lvalue .f {{.*}}
94-
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S':'S' lvalue Var {{.*}} 's' 'struct S':'S'
94+
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct S' lvalue Var {{.*}} 's' 'struct S'
9595

9696
struct T {
9797
operator float() const { return 1.0f; }
@@ -105,12 +105,12 @@ void entry() {
105105
// CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
106106
// CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
107107
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
108-
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
108+
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
109109
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'float' <UserDefinedConversion>
110110
// CHECK-NEXT: CXXMemberCallExpr {{.*}} 'float'
111111
// CHECK-NEXT: MemberExpr {{.*}} '<bound member function type>' .operator float {{.*}}
112112
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const T' lvalue <NoOp>
113-
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T':'T' lvalue Var {{.*}} 't' 'struct T':'T'
113+
// CHECK-NEXT: DeclRefExpr {{.*}} 'struct T' lvalue Var {{.*}} 't' 'struct T'
114114

115115
typedef float2 second_level_of_typedefs;
116116
second_level_of_typedefs foo6 = float2(1.0f, 2.0f);

‎clang/test/AST/arm-mfp8.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class C1 {
4949
}
5050
};
5151

52-
//CHECK: | |-CXXRecordDecl {{.*}} referenced class C1
52+
//CHECK: | |-CXXRecordDecl {{.*}} class C1
5353
//CHECK-NEXT: | |-FieldDecl {{.*}} f1c '__mfp8'
5454
//CHECK-NEXT: | |-VarDecl {{.*}} f2c 'const __mfp8' static
5555
//CHECK-NEXT: | |-FieldDecl {{.*}} f3c 'volatile __mfp8'

0 commit comments

Comments
 (0)