Skip to content

Commit 480ed25

Browse files
committed
Fixes from code reviews.
1 parent 3da9615 commit 480ed25

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,16 +445,17 @@ BuiltinTypeMethodBuilder::getResourceHandle(T ResourceRecord) {
445445
ASTContext &AST = DeclBuilder.SemaRef.getASTContext();
446446
FieldDecl *HandleField = DeclBuilder.getResourceHandleField();
447447
MemberExpr *HandleExpr = MemberExpr::CreateImplicit(
448-
AST, ResourceExpr, false, HandleField, HandleField->getType(), VK_LValue,
449-
OK_Ordinary);
448+
AST, ResourceExpr, /*IsArrow=*/false, HandleField, HandleField->getType(),
449+
VK_LValue, OK_Ordinary);
450450
StmtsList.push_back(HandleExpr);
451451
return *this;
452452
}
453453

454454
BuiltinTypeMethodBuilder &BuiltinTypeMethodBuilder::returnThis() {
455455
ASTContext &AST = DeclBuilder.SemaRef.getASTContext();
456456
CXXThisExpr *ThisExpr = CXXThisExpr::Create(
457-
AST, SourceLocation(), Method->getFunctionObjectParameterType(), true);
457+
AST, SourceLocation(), Method->getFunctionObjectParameterType(),
458+
/*IsImplicit=*/true);
458459
StmtsList.push_back(ThisExpr);
459460
return *this;
460461
}
@@ -715,10 +716,11 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyConstructor() {
715716

716717
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
717718

718-
return BuiltinTypeMethodBuilder(*this, "", AST.VoidTy, false, true)
719+
return BuiltinTypeMethodBuilder(*this, /*Name=*/"", AST.VoidTy,
720+
/*IsConst=*/false, /*IsCtor=*/true)
719721
.addParam("other", ConstRecordRefType)
720722
.getResourceHandle(PH::_0)
721-
.assign(PH::Handle, PH::LastStmt)
723+
.assign(PH.Handle, PH.LastStmt)
722724
.finalize();
723725
}
724726

@@ -734,7 +736,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addCopyAssignmentOperator() {
734736

735737
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
736738
DeclarationName Name = AST.DeclarationNames.getCXXOperatorName(OO_Equal);
737-
return BuiltinTypeMethodBuilder(*this, Name, RecordRefType, false, false)
739+
return BuiltinTypeMethodBuilder(*this, Name, RecordRefType)
738740
.addParam("other", ConstRecordRefType)
739741
.getResourceHandle(PH::_0)
740742
.assign(PH::Handle, PH::LastStmt)

clang/test/CodeGenHLSL/resources/res-array-local-multi-dim.hlsl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ void main() {
4343
// CHECK: %[[ref_tmp7:.*]] = alloca %"class.hlsl::RWBuffer", align 4
4444
// CHECK: %[[agg_tmp:.*]] = alloca [2 x [2 x %"class.hlsl::RWBuffer"]], align 4
4545
// CHECK: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp]], ptr {{.*}} @_ZL1A)
46-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp1]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp]])
47-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp2]], ptr noundef nonnull align 4 dereferenceable(4) @_ZL1B)
48-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp3]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp2]])
49-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp4]], ptr noundef nonnull align 4 dereferenceable(4) @_ZL1A)
50-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp5]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp4]])
51-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp6]], ptr noundef nonnull align 4 dereferenceable(4) @_ZL1B)
52-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp7]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp6]])
53-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %L, ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp1]])
46+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp1]], ptr {{.*}} %[[ref_tmp]])
47+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp2]], ptr {{.*}} @_ZL1B)
48+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp3]], ptr {{.*}} %[[ref_tmp2]])
49+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp4]], ptr {{.*}} @_ZL1A)
50+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp5]], ptr {{.*}} %[[ref_tmp4]])
51+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp6]], ptr {{.*}} @_ZL1B)
52+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[ref_tmp7]], ptr {{.*}} %[[ref_tmp6]])
53+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %L, ptr {{.*}} %[[ref_tmp1]])
5454
// CHECK-NEXT: %[[arrayinit_element:.*]] = getelementptr inbounds %"class.hlsl::RWBuffer", ptr %L, i32 1
55-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[arrayinit_element]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp3]])
55+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[arrayinit_element]], ptr {{.*}} %[[ref_tmp3]])
5656
// CHECK-NEXT: %[[arrayinit_element8:.*]] = getelementptr inbounds [2 x %"class.hlsl::RWBuffer"], ptr %L, i32 1
57-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[arrayinit_element8]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp5]])
57+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[arrayinit_element8]], ptr {{.*}} %[[ref_tmp5]])
5858
// CHECK-NEXT: %[[arrayinit_element9:.*]] = getelementptr inbounds %"class.hlsl::RWBuffer", ptr %[[arrayinit_element8]], i32 1
59-
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr noundef nonnull align 4 dereferenceable(4) %[[arrayinit_element9]], ptr noundef nonnull align 4 dereferenceable(4) %[[ref_tmp7]])
59+
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIfEC1ERKS1_(ptr {{.*}} %[[arrayinit_element9]], ptr {{.*}} %[[ref_tmp7]])
6060
RWBuffer<float> L[2][2] = { { A, B }, { A, B } };
6161

6262
// CHECK: call void @llvm.memcpy.p0.p0.i32(ptr align 4 %[[agg_tmp]], ptr align 4 %L, i32 16, i1 false)

0 commit comments

Comments
 (0)