llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Steven Perron (s-perron) <details> <summary>Changes</summary> - **Reapply "[HLSL] Improve HLSL resource method generation" (#<!-- -->178266)** - **Fix msan error** --- Patch is 55.21 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/178427.diff 6 Files Affected: - (modified) clang/include/clang/AST/TypeLoc.h (+2-1) - (modified) clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp (+38-18) - (modified) clang/lib/Sema/TreeTransform.h (+6-2) - (modified) clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl (+23-13) - (modified) clang/test/AST/HLSL/StructuredBuffers-AST.hlsl (+72-74) - (modified) clang/test/AST/HLSL/TypedBuffers-AST.hlsl (+33-34) ``````````diff diff --git a/clang/include/clang/AST/TypeLoc.h b/clang/include/clang/AST/TypeLoc.h index 2cefaa9611c98..0f8eea43d0972 100644 --- a/clang/include/clang/AST/TypeLoc.h +++ b/clang/include/clang/AST/TypeLoc.h @@ -1096,7 +1096,8 @@ class HLSLAttributedResourceTypeLoc void setSourceRange(const SourceRange &R) { getLocalData()->Range = R; } SourceRange getLocalSourceRange() const { return getLocalData()->Range; } void initializeLocal(ASTContext &Context, SourceLocation loc) { - setSourceRange(SourceRange()); + setSourceRange(SourceRange(loc)); + setContainedTypeSourceInfo(nullptr); } QualType getInnerType() const { return getTypePtr()->getWrappedType(); } unsigned getLocalDataSize() const { diff --git a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp index 868f894a03c49..f74aabf08d2c7 100644 --- a/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp +++ b/clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp @@ -401,12 +401,16 @@ Expr *BuiltinTypeMethodBuilder::convertPlaceholder(PlaceHolder PH) { return cast<ValueStmt>(LastStmt)->getExprStmt(); } + // All other placeholders are parameters (_N), and can be loaded as an + // LValue. It needs to be an LValue if the result expression will be used as + // the actual parameter for an out parameter. The dimension builtins are an + // example where this happens. ASTContext &AST = DeclBuilder.SemaRef.getASTContext(); ParmVarDecl *ParamDecl = Method->getParamDecl(static_cast<unsigned>(PH)); return DeclRefExpr::Create( AST, NestedNameSpecifierLoc(), SourceLocation(), ParamDecl, false, DeclarationNameInfo(ParamDecl->getDeclName(), SourceLocation()), - ParamDecl->getType().getNonReferenceType(), VK_PRValue); + ParamDecl->getType().getNonReferenceType(), VK_LValue); } Expr *BuiltinTypeMethodBuilder::convertPlaceholder(LocalVar &Var) { @@ -584,16 +588,22 @@ BuiltinTypeMethodBuilder::callBuiltin(StringRef BuiltinName, AST, NestedNameSpecifierLoc(), SourceLocation(), FD, false, FD->getNameInfo(), AST.BuiltinFnTy, VK_PRValue); - auto *ImpCast = ImplicitCastExpr::Create( - AST, AST.getPointerType(FD->getType()), CK_BuiltinFnToFnPtr, DRE, nullptr, - VK_PRValue, FPOptionsOverride()); - - if (ReturnType.isNull()) - ReturnType = FD->getReturnType(); + ExprResult Call = DeclBuilder.SemaRef.BuildCallExpr( + /*Scope=*/nullptr, DRE, SourceLocation(), + MultiExprArg(Args.data(), Args.size()), SourceLocation()); + assert(!Call.isInvalid() && "Call to builtin cannot fail!"); + Expr *E = Call.get(); + + if (!ReturnType.isNull() && + !AST.hasSameUnqualifiedType(ReturnType, E->getType())) { + ExprResult CastResult = DeclBuilder.SemaRef.BuildCStyleCastExpr( + SourceLocation(), AST.getTrivialTypeSourceInfo(ReturnType), + SourceLocation(), E); + assert(!CastResult.isInvalid() && "Cast cannot fail!"); + E = CastResult.get(); + } - Expr *Call = CallExpr::Create(AST, ImpCast, Args, ReturnType, VK_PRValue, - SourceLocation(), FPOptionsOverride()); - StmtsList.push_back(Call); + StmtsList.push_back(E); return *this; } @@ -627,6 +637,8 @@ BuiltinTypeMethodBuilder::accessHandleFieldOnResource(T ResourceRecord) { ensureCompleteDecl(); Expr *ResourceExpr = convertPlaceholder(ResourceRecord); + assert(ResourceExpr->getType()->getAsCXXRecordDecl() == DeclBuilder.Record && + "Getting the field from the wrong resource type."); ASTContext &AST = DeclBuilder.SemaRef.getASTContext(); FieldDecl *HandleField = DeclBuilder.getResourceHandleField(); @@ -659,6 +671,10 @@ BuiltinTypeMethodBuilder &BuiltinTypeMethodBuilder::setFieldOnResource( ensureCompleteDecl(); Expr *ResourceExpr = convertPlaceholder(ResourceRecord); + assert(ResourceExpr->getType()->getAsCXXRecordDecl() == + HandleField->getParent() && + "Getting the field from the wrong resource type."); + Expr *HandleValueExpr = convertPlaceholder(HandleValue); ASTContext &AST = DeclBuilder.SemaRef.getASTContext(); @@ -679,6 +695,8 @@ BuiltinTypeMethodBuilder::accessCounterHandleFieldOnResource(T ResourceRecord) { ensureCompleteDecl(); Expr *ResourceExpr = convertPlaceholder(ResourceRecord); + assert(ResourceExpr->getType()->getAsCXXRecordDecl() == DeclBuilder.Record && + "Getting the field from the wrong resource type."); ASTContext &AST = DeclBuilder.SemaRef.getASTContext(); FieldDecl *HandleField = DeclBuilder.getResourceCounterHandleField(); @@ -1000,6 +1018,7 @@ BuiltinTypeDeclBuilder::addCreateFromBindingWithImplicitCounter() { using PH = BuiltinTypeMethodBuilder::PlaceHolder; ASTContext &AST = SemaRef.getASTContext(); QualType HandleType = getResourceHandleField()->getType(); + QualType CounterHandleType = getResourceCounterHandleField()->getType(); QualType RecordType = AST.getTypeDeclType(cast<TypeDecl>(Record)); BuiltinTypeMethodBuilder::LocalVar TmpVar("tmp", RecordType); @@ -1019,7 +1038,7 @@ BuiltinTypeDeclBuilder::addCreateFromBindingWithImplicitCounter() { .setHandleFieldOnResource(TmpVar, PH::LastStmt) .accessHandleFieldOnResource(TmpVar) .callBuiltin("__builtin_hlsl_resource_counterhandlefromimplicitbinding", - HandleType, PH::LastStmt, PH::_5, PH::_1) + CounterHandleType, PH::LastStmt, PH::_5, PH::_1) .setCounterHandleFieldOnResource(TmpVar, PH::LastStmt) .returnValue(TmpVar) .finalize(); @@ -1048,6 +1067,7 @@ BuiltinTypeDeclBuilder::addCreateFromImplicitBindingWithImplicitCounter() { using PH = BuiltinTypeMethodBuilder::PlaceHolder; ASTContext &AST = SemaRef.getASTContext(); QualType HandleType = getResourceHandleField()->getType(); + QualType CounterHandleType = getResourceCounterHandleField()->getType(); QualType RecordType = AST.getTypeDeclType(cast<TypeDecl>(Record)); BuiltinTypeMethodBuilder::LocalVar TmpVar("tmp", RecordType); @@ -1068,7 +1088,7 @@ BuiltinTypeDeclBuilder::addCreateFromImplicitBindingWithImplicitCounter() { .setHandleFieldOnResource(TmpVar, PH::LastStmt) .accessHandleFieldOnResource(TmpVar) .callBuiltin("__builtin_hlsl_resource_counterhandlefromimplicitbinding", - HandleType, PH::LastStmt, PH::_5, PH::_1) + CounterHandleType, PH::LastStmt, PH::_5, PH::_1) .setCounterHandleFieldOnResource(TmpVar, PH::LastStmt) .returnValue(TmpVar) .finalize(); @@ -1217,18 +1237,18 @@ BuiltinTypeDeclBuilder::addSimpleTemplateParams(ArrayRef<StringRef> Names, BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addIncrementCounterMethod() { using PH = BuiltinTypeMethodBuilder::PlaceHolder; - return BuiltinTypeMethodBuilder(*this, "IncrementCounter", - SemaRef.getASTContext().UnsignedIntTy) - .callBuiltin("__builtin_hlsl_buffer_update_counter", QualType(), + QualType UnsignedIntTy = SemaRef.getASTContext().UnsignedIntTy; + return BuiltinTypeMethodBuilder(*this, "IncrementCounter", UnsignedIntTy) + .callBuiltin("__builtin_hlsl_buffer_update_counter", UnsignedIntTy, PH::CounterHandle, getConstantIntExpr(1)) .finalize(); } BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addDecrementCounterMethod() { using PH = BuiltinTypeMethodBuilder::PlaceHolder; - return BuiltinTypeMethodBuilder(*this, "DecrementCounter", - SemaRef.getASTContext().UnsignedIntTy) - .callBuiltin("__builtin_hlsl_buffer_update_counter", QualType(), + QualType UnsignedIntTy = SemaRef.getASTContext().UnsignedIntTy; + return BuiltinTypeMethodBuilder(*this, "DecrementCounter", UnsignedIntTy) + .callBuiltin("__builtin_hlsl_buffer_update_counter", UnsignedIntTy, PH::CounterHandle, getConstantIntExpr(-1)) .finalize(); } diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h index dd061996a0f9e..fb32b0e70e3c9 100644 --- a/clang/lib/Sema/TreeTransform.h +++ b/clang/lib/Sema/TreeTransform.h @@ -7767,12 +7767,13 @@ QualType TreeTransform<Derived>::TransformHLSLAttributedResourceType( QualType ContainedTy = QualType(); QualType OldContainedTy = oldType->getContainedType(); + TypeSourceInfo *ContainedTSI = nullptr; if (!OldContainedTy.isNull()) { TypeSourceInfo *oldContainedTSI = TL.getContainedTypeSourceInfo(); if (!oldContainedTSI) oldContainedTSI = getSema().getASTContext().getTrivialTypeSourceInfo( OldContainedTy, SourceLocation()); - TypeSourceInfo *ContainedTSI = getDerived().TransformType(oldContainedTSI); + ContainedTSI = getDerived().TransformType(oldContainedTSI); if (!ContainedTSI) return QualType(); ContainedTy = ContainedTSI->getType(); @@ -7785,7 +7786,10 @@ QualType TreeTransform<Derived>::TransformHLSLAttributedResourceType( WrappedTy, ContainedTy, oldType->getAttrs()); } - TLB.push<HLSLAttributedResourceTypeLoc>(Result); + HLSLAttributedResourceTypeLoc NewTL = + TLB.push<HLSLAttributedResourceTypeLoc>(Result); + NewTL.setSourceRange(TL.getLocalSourceRange()); + NewTL.setContainedTypeSourceInfo(ContainedTSI); return Result; } diff --git a/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl b/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl index 2713cc19ea2be..619b12a278b10 100644 --- a/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl +++ b/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl @@ -65,7 +65,7 @@ RESOURCE Buffer; // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle -// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]' ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]] &' +// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]' lvalue ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]] &' // CHECK-NEXT: AlwaysInlineAttr // operator= @@ -77,7 +77,7 @@ RESOURCE Buffer; // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle -// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]' ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]] &' +// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]' lvalue ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]] &' // CHECK-NEXT: ReturnStmt // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this // CHECK-NEXT: AlwaysInlineAttr @@ -101,11 +101,16 @@ RESOURCE Buffer; // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding' '__hlsl_resource_t (__hlsl_resource_t, unsigned int, unsigned int, int, unsigned int, const char *) noexcept' // CHECK-NEXT: MemberExpr {{.*}} '__hlsl_resource_t {{.*}}' lvalue .__handle // CHECK-NEXT: DeclRefExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue Var {{.*}} 'tmp' 'hlsl::[[RESOURCE]]' -// 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' -// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int' -// CHECK-NEXT: DeclRefExpr {{.*}} 'const char *' ParmVar {{.*}} 'name' 'const char *' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'unsigned int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'registerNo' 'unsigned int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'unsigned int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'spaceNo' 'unsigned int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} 'range' 'int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'unsigned int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'index' 'unsigned int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const char *' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'const char *' lvalue ParmVar {{.*}} 'name' 'const char *' // CHECK-NEXT: ReturnStmt // CHECK-NEXT: CXXConstructExpr {{.*}} 'hlsl::[[RESOURCE]]' 'void (const hlsl::[[RESOURCE]] &)' // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const hlsl::[[RESOURCE]]' xvalue <NoOp> @@ -131,11 +136,16 @@ RESOURCE Buffer; // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefromimplicitbinding' '__hlsl_resource_t (__hlsl_resource_t, unsigned int, unsigned int, int, unsigned int, const char *) noexcept' // CHECK-NEXT: MemberExpr {{.*}} '__hlsl_resource_t {{.*}}' lvalue .__handle // CHECK-NEXT: DeclRefExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue Var {{.*}} 'tmp' 'hlsl::[[RESOURCE]]' -// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'orderId' 'unsigned int' -// 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' -// CHECK-NEXT: DeclRefExpr {{.*}} 'const char *' ParmVar {{.*}} 'name' 'const char *' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'unsigned int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'orderId' 'unsigned int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'unsigned int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'spaceNo' 'unsigned int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} 'range' 'int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'unsigned int' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'index' 'unsigned int' +// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const char *' <LValueToRValue> +// CHECK-NEXT: DeclRefExpr {{.*}} 'const char *' lvalue ParmVar {{.*}} 'name' 'const char *' // CHECK-NEXT: ReturnStmt // CHECK-NEXT: CXXConstructExpr {{.*}} 'hlsl::[[RESOURCE]]' 'void (const hlsl::[[RESOURCE]] &)' // CHECK-NEXT: ImplicitCastExpr {{.*}} 'const hlsl::[[RESOURCE]]' xvalue <NoOp> @@ -153,7 +163,7 @@ RESOURCE Buffer; // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_getdimensions_x' 'void (__hlsl_resource_t, unsigned int &) noexcept' // CHECK-NEXT: MemberExpr {{.*}} '__hlsl_resource_t {{.*}}' lvalue .__handle {{.*}} // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]' lvalue implicit this -// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'dim' 'unsigned int &__restrict' +// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'dim' 'unsigned int &__restrict' // CHECK-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline // CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'const char8_t &(unsigned int) const' diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl index eb65a28dba6ff..2bcca4854b136 100644 --- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl +++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl @@ -96,8 +96,8 @@ RESOURCE<float> Buffer; // CHECK-NEXT: BinaryOperator {{.*}} '=' // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this -// CHECK-NEXT: CallExpr {{.*}} '__hlsl_resource_t -// CHECK-NEXT: ImplicitCastExpr {{.*}} '__hlsl_resource_t (*)(__hlsl_resource_t) noexcept' <BuiltinFnToFnPtr> +// CHECK-NEXT: CStyleCastExpr {{.*}} '__hlsl_resource_t +// CHECK-NEXT: CallExpr // CHECK-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_uninitializedhandle' '__hlsl_resource_t (__hlsl_resource_t) noexcept' // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this @@ -112,12 +112,12 @@ RESOURCE<float> Buffer; // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle -// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' +// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' // CHECK-COUNTER-HANDLE-NEXT: BinaryOperator {{.*}} '=' // CHECK-COUNTER-HANDLE-NEXT: MemberExpr {{.*}} lvalue .__counter_handle // CHECK-COUNTER-HANDLE-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this // CHECK-COUNTER-HANDLE-NEXT: MemberExpr {{.*}} lvalue .__counter_handle -// CHECK-COUNTER-HANDLE-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' +// CHECK-COUNTER-HANDLE-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' // CHECK-NEXT: AlwaysInlineAttr // operator= @@ -129,12 +129,12 @@ RESOURCE<float> Buffer; // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this // CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle -// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' +// CHECK-NEXT: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' // CHECK-COUNTER-HANDLE: BinaryOperator {{.*}} '=' // CHECK-COUNTER-HANDLE: MemberExpr {{.*}} lvalue .__counter_handle // CHECK-COUNTER-HANDLE: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this // CHECK-COUNTER-HANDLE: MemberExpr {{.*}} lvalue .__counter_handle -// CHECK-COUNTER-HANDLE: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' +// CHECK-COUNTER-HANDLE: DeclRefExpr {{.*}} 'const hlsl::[[RESOURCE]]<element_type>' lvalue ParmVar {{.*}} 'other' 'const hlsl::[[RESOURCE]]<element_type> &' // CHECK-NEXT: ReturnStmt // CHECK-NEXT: CXXThisExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue implicit this // CHECK-NEXT: AlwaysInlineAttr @@ -153,16 +153,16 @@ RESOURCE<float> Buffer; // CHECK-BINDING-NEXT: BinaryOperator {{.*}} '__hlsl_resource_t {{.*}}]]' '=' // CHECK-BINDING-NEXT: MemberExpr {{.*}} '__hlsl_resource_t {{.*}}' lvalue .__handle // CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue Var {{.*}} 'tmp' 'hlsl::[[RESOURCE]]<element_type>' -// CHECK-BINDING-NEXT: CallExpr {{.*}} '__hlsl_resource_t {{.*}}' -// CHECK-BINDING-NEXT: ImplicitCastExpr {{.*}} '__hlsl_resource_t (*)(__hlsl_resource_t, unsigned int, unsigned int, int, unsigned int, const char *) noexcept' <BuiltinFnToFnPtr> +// CHECK-BINDING-NEXT: CStyleCastExpr {{.*}} '__hlsl_resource_t +// CHECK-BINDING-NEXT: CallExpr // CHECK-BINDING-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_handlefrombinding' '__hlsl_resource_t (__hlsl_resource_t, unsigned int, unsigned int, int, unsigned int, const char *) noexcept' // CHECK-BINDING-NEXT: MemberExpr {{.*}} '__hlsl_resource_t {{.*}}' lvalue .__handle // CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'hlsl::[[RESOURCE]]<element_type>' lvalue Var {{.*}} 'tmp' 'hlsl::[[RESOURCE]]<element_type>' -// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'registerNo' 'unsigned int' -// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int' -// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int' -// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int' -// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'const char *' ParmVar {{.*}} 'name' 'const char *' +// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*}} 'registerNo' 'unsigned int' +// CHECK-BINDING-NEXT: DeclRefExpr {{.*}} 'unsigned int' lvalue ParmVar {{.*... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/178427 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
