Skip to content

Commit 4818dd3

Browse files
bognerbogner
authored
[HLSL] Rename resource's "h" member to "__handle". NFC (#116696)
This makes it clearer that the handle is an implementation detail by using a name that's reserved.
1 parent 8cd348c commit 4818dd3

10 files changed

+18
-18
lines changed

‎clang/lib/Sema/HLSLExternalSemaSource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ struct BuiltinTypeDeclBuilder {
139139
Attr *ResourceAttr = HLSLResourceAttr::CreateImplicit(Ctx, RK);
140140
if (CreateHLSLAttributedResourceType(S, Ctx.HLSLResourceTy, Attrs,
141141
AttributedResTy))
142-
addMemberVariable("h", AttributedResTy, {ResourceAttr}, Access);
142+
addMemberVariable("__handle", AttributedResTy, {ResourceAttr}, Access);
143143
return *this;
144144
}
145145

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ AppendStructuredBuffer<int> Buffer;
3030
// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class AppendStructuredBuffer definition
3131

3232
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
33-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
33+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
3434
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
3535
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
3636
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
@@ -43,7 +43,7 @@ AppendStructuredBuffer<int> Buffer;
4343
// CHECK: TemplateArgument type 'int'
4444
// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'int'
4545
// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
46-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
46+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
4747
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
4848
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
4949
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(int)]]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ConsumeStructuredBuffer<int> Buffer;
3030
// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class ConsumeStructuredBuffer definition
3131

3232
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
33-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
33+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
3434
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
3535
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
3636
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
@@ -44,7 +44,7 @@ ConsumeStructuredBuffer<int> Buffer;
4444
// CHECK: TemplateArgument type 'int'
4545
// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'int'
4646
// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
47-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
47+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
4848
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
4949
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
5050
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(int)]]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RWBuffer<float> Buffer;
2929
// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class RWBuffer definition
3030

3131
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
32-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
32+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
3333
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
3434
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
3535
// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit TypedBuffer
@@ -55,7 +55,7 @@ RWBuffer<float> Buffer;
5555
// CHECK: TemplateArgument type 'float'
5656
// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'float'
5757
// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
58-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
59-
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
58+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
59+
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
6060
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(float)]]
6161
// CHECK-NEXT: HLSLResourceAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit TypedBuffer

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RWStructuredBuffer<int> Buffer;
3030
// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class RWStructuredBuffer definition
3131

3232
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
33-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
33+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
3434
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
3535
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
3636
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
@@ -57,7 +57,7 @@ RWStructuredBuffer<int> Buffer;
5757
// CHECK: TemplateArgument type 'int'
5858
// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'int'
5959
// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
60-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
60+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
6161
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
6262
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
6363
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(int)]]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RasterizerOrderedStructuredBuffer<int> Buffer;
3030
// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class RasterizerOrderedStructuredBuffer definition
3131

3232
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
33-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
33+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
3434
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
3535
// CHECK-SAME{LITERAL}: [[hlsl::is_rov]]
3636
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
@@ -58,7 +58,7 @@ RasterizerOrderedStructuredBuffer<int> Buffer;
5858
// CHECK: TemplateArgument type 'int'
5959
// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'int'
6060
// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
61-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
61+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
6262
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
6363
// CHECK-SAME{LITERAL}: [[hlsl::is_rov]]
6464
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ StructuredBuffer<float> Buffer;
3030
// CHECK-NEXT: CXXRecordDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit class StructuredBuffer definition
3131

3232
// CHECK: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
33-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
33+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
3434
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
3535
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
3636
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
@@ -57,7 +57,7 @@ StructuredBuffer<float> Buffer;
5757
// CHECK: TemplateArgument type 'float'
5858
// CHECK-NEXT: BuiltinType 0x{{[0-9A-Fa-f]+}} 'float'
5959
// CHECK-NEXT: FinalAttr 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> Implicit final
60-
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
60+
// CHECK-NEXT: FieldDecl 0x{{[0-9A-Fa-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
6161
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(SRV)]]
6262
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
6363
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(float)]]

‎clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// CHECK: -ClassTemplateSpecializationDecl 0x{{[0-9a-f]+}} <<invalid sloc>> <invalid sloc> class RWBuffer definition implicit_instantiation
44
// CHECK: -TemplateArgument type 'float'
55
// CHECK: `-BuiltinType 0x{{[0-9a-f]+}} 'float'
6-
// CHECK: -FieldDecl 0x{{[0-9a-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
6+
// CHECK: -FieldDecl 0x{{[0-9a-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
77
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
88
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(float)]]
99
// CHECK: -HLSLResourceAttr 0x{{[0-9a-f]+}} <<invalid sloc>> Implicit TypedBuffer
@@ -13,7 +13,7 @@ RWBuffer<float> Buffer1;
1313
// CHECK: -TemplateArgument type 'vector<float, 4>'
1414
// CHECK: `-ExtVectorType 0x{{[0-9a-f]+}} 'vector<float, 4>' 4
1515
// CHECK: `-BuiltinType 0x{{[0-9a-f]+}} 'float'
16-
// CHECK: -FieldDecl 0x{{[0-9a-f]+}} <<invalid sloc>> <invalid sloc> implicit h '__hlsl_resource_t
16+
// CHECK: -FieldDecl 0x{{[0-9a-f]+}} <<invalid sloc>> <invalid sloc> implicit __handle '__hlsl_resource_t
1717
// CHECK-SAME{LITERAL}: [[hlsl::resource_class(UAV)]
1818
// CHECK-SAME{LITERAL}: [[hlsl::is_rov]]
1919
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(vector<float, 4>)]]

‎clang/test/SemaHLSL/BuiltIns/RWBuffers.hlsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ RWBuffer<> BufferErr2;
1414

1515
[numthreads(1,1,1)]
1616
void main() {
17-
(void)Buffer.h; // expected-error {{'h' is a private member of 'hlsl::RWBuffer<vector<float, 3>>'}}
17+
(void)Buffer.__handle; // expected-error {{'__handle' is a private member of 'hlsl::RWBuffer<vector<float, 3>>'}}
1818
// expected-note@* {{implicitly declared private here}}
1919
}

‎clang/test/SemaHLSL/BuiltIns/StructuredBuffers.hlsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ StructuredBuffer<> BufferErr2;
1414

1515
[numthreads(1,1,1)]
1616
void main() {
17-
(void)Buffer.h; // expected-error {{'h' is a private member of 'hlsl::StructuredBuffer<vector<float, 3>>'}}
17+
(void)Buffer.__handle; // expected-error {{'__handle' is a private member of 'hlsl::StructuredBuffer<vector<float, 3>>'}}
1818
// expected-note@* {{implicitly declared private here}}
1919
}

0 commit comments

Comments
 (0)