Skip to content

Commit 4bbeb6f

Browse files
hekotahekota
committed
Code review feedback - rename builtins
1 parent ae71b6f commit 4bbeb6f

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎clang/include/clang/Basic/Builtins.td‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4801,14 +4801,14 @@ def HLSLResourceGetPointer : LangBuiltin<"HLSL_LANG"> {
48014801
let Prototype = "void(...)";
48024802
}
48034803

4804-
def HLSLResourceCreatePoisonHandle : LangBuiltin<"HLSL_LANG"> {
4805-
let Spellings = ["__builtin_hlsl_resource_createpoisonhandle"];
4804+
def HLSLResourceUninitializedHandle : LangBuiltin<"HLSL_LANG"> {
4805+
let Spellings = ["__builtin_hlsl_resource_uninitializedhandle"];
48064806
let Attributes = [NoThrow];
48074807
let Prototype = "void(...)";
48084808
}
48094809

4810-
def HLSLResourceCreateHandleFromBinding : LangBuiltin<"HLSL_LANG"> {
4811-
let Spellings = ["__builtin_hlsl_resource_createhandlefrombinding"];
4810+
def HLSLResourceHandleFromBinding : LangBuiltin<"HLSL_LANG"> {
4811+
let Spellings = ["__builtin_hlsl_resource_handlefrombinding"];
48124812
let Attributes = [NoThrow];
48134813
let Prototype = "void(...)";
48144814
}

‎clang/lib/CodeGen/CGHLSLBuiltins.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,11 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
285285
RetTy, CGM.getHLSLRuntime().getCreateResourceGetPointerIntrinsic(),
286286
ArrayRef<Value *>{HandleOp, IndexOp});
287287
}
288-
case Builtin::BI__builtin_hlsl_resource_createpoisonhandle: {
288+
case Builtin::BI__builtin_hlsl_resource_uninitializedhandle: {
289289
llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
290290
return llvm::PoisonValue::get(HandleTy);
291291
}
292-
case Builtin::BI__builtin_hlsl_resource_createhandlefrombinding: {
292+
case Builtin::BI__builtin_hlsl_resource_handlefrombinding: {
293293
llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
294294
Value *RegisterOp = EmitScalarExpr(E->getArg(1));
295295
Value *SpaceOp = EmitScalarExpr(E->getArg(2));

‎clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDefaultHandleConstructor() {
642642
QualType HandleType = getResourceHandleField()->getType();
643643
return BuiltinTypeMethodBuilder(*this, "", SemaRef.getASTContext().VoidTy,
644644
false, true)
645-
.callBuiltin("__builtin_hlsl_resource_createpoisonhandle", HandleType,
645+
.callBuiltin("__builtin_hlsl_resource_uninitializedhandle", HandleType,
646646
PH::Handle)
647647
.assign(PH::Handle, PH::LastStmt)
648648
.finalize();
@@ -662,8 +662,8 @@ BuiltinTypeDeclBuilder::addHandleConstructorFromBinding() {
662662
.addParam("spaceNo", AST.UnsignedIntTy)
663663
.addParam("range", AST.IntTy)
664664
.addParam("index", AST.UnsignedIntTy)
665-
.callBuiltin("__builtin_hlsl_resource_createhandlefrombinding",
666-
HandleType, PH::Handle, PH::_0, PH::_1, PH::_2, PH::_3)
665+
.callBuiltin("__builtin_hlsl_resource_handlefrombinding", HandleType,
666+
PH::Handle, PH::_0, PH::_1, PH::_2, PH::_3)
667667
.assign(PH::Handle, PH::LastStmt)
668668
.finalize();
669669
}

‎clang/lib/Sema/SemaHLSL.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,7 +2396,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
23962396

23972397
break;
23982398
}
2399-
case Builtin::BI__builtin_hlsl_resource_createpoisonhandle: {
2399+
case Builtin::BI__builtin_hlsl_resource_uninitializedhandle: {
24002400
if (SemaRef.checkArgCount(TheCall, 1) ||
24012401
CheckResourceHandle(&SemaRef, TheCall, 0))
24022402
return true;
@@ -2405,7 +2405,7 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
24052405
TheCall->setType(ResourceTy);
24062406
break;
24072407
}
2408-
case Builtin::BI__builtin_hlsl_resource_createhandlefrombinding: {
2408+
case Builtin::BI__builtin_hlsl_resource_handlefrombinding: {
24092409
ASTContext &AST = SemaRef.getASTContext();
24102410
if (SemaRef.checkArgCount(TheCall, 5) ||
24112411
CheckResourceHandle(&SemaRef, TheCall, 0) ||

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RESOURCE Buffer;
5151
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
5252
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
5353
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
54-
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_createpoisonhandle'
54+
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
5555
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
5656
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
5757
// CHECK-NEXT: AlwaysInlineAttr
@@ -69,7 +69,7 @@ RESOURCE Buffer;
6969
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
7070
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
7171
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
72-
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_createhandlefrombinding'
72+
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
7373
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
7474
// CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this
7575
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RESOURCE<float> Buffer;
9898
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
9999
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
100100
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
101-
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_createpoisonhandle'
101+
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
102102
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
103103
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
104104
// CHECK-NEXT: AlwaysInlineAttr
@@ -116,7 +116,7 @@ RESOURCE<float> Buffer;
116116
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
117117
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
118118
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
119-
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_createhandlefrombinding'
119+
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
120120
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
121121
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
122122
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ RESOURCE<float> Buffer;
6565
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
6666
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
6767
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
68-
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_createpoisonhandle'
68+
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle'
6969
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
7070
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
7171
// CHECK-NEXT: AlwaysInlineAttr
@@ -83,7 +83,7 @@ RESOURCE<float> Buffer;
8383
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
8484
// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t
8585
// CHECK-NEXT: ImplicitCastExpr {{.*}} <BuiltinFnToFnPtr>
86-
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_createhandlefrombinding'
86+
// CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding'
8787
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
8888
// CHECK-NEXT: CXXThisExpr {{.*}} '[[RESOURCE]]<element_type>' lvalue implicit this
8989
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int'

‎clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling-special-ctor-dtor
1010

1111
// Resource with explicit binding
12-
ByteAddressBuffer Buf1: register(t1, space2);
12+
ByteAddressBuffer Buf1 : register(t1, space2);
1313

1414
// Resource with implicit binding
1515
RWByteAddressBuffer Buf2;

0 commit comments

Comments
 (0)