fixup: resource_getpointer sema checks

Author: bogner

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12496,7 +12496,6 @@ def err_hlsl_pointers_unsupported : Error<
   "%select{pointers|references}0 are unsupported in HLSL">;
 def err_hlsl_missing_resource_class : Error<"HLSL resource needs to have [[hlsl::resource_class()]] attribute">;
 def err_hlsl_attribute_needs_intangible_type: Error<"attribute %0 can be used only on HLSL intangible type %1">;
-def err_hlsl_builtin_requires_resource: Error<"operand must be of __hlsl_resource_t type">;
 
 def err_hlsl_operator_unsupported : Error<
   "the '%select{&|*|->}0' operator is unsupported in HLSL">;

clang/lib/Sema/SemaHLSL.cpp

@@ -1908,7 +1908,7 @@ static bool CheckResourceHandle(
   const HLSLAttributedResourceType *ResTy =
       ArgType.getTypePtr()->getAs<HLSLAttributedResourceType>();
   if (!ResTy) {
-    S->Diag(TheCall->getArg(0)->getBeginLoc(),
+    S->Diag(TheCall->getArg(ArgIndex)->getBeginLoc(),
             diag::err_typecheck_expect_hlsl_resource)
         << ArgType;
     return true;
@@ -1927,17 +1927,15 @@ static bool CheckResourceHandle(
 bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
   switch (BuiltinID) {
   case Builtin::BI__builtin_hlsl_resource_getpointer: {
-    if (SemaRef.checkArgCount(TheCall, 2))
-      return true;
-    auto *ResourceTy =
-        TheCall->getArg(0)->getType()->getAs<HLSLAttributedResourceType>();
-    if (!ResourceTy) {
-      SemaRef.Diag(TheCall->getBeginLoc(),
-                   diag::err_hlsl_builtin_requires_resource)
-          << TheCall->getArg(0)->getSourceRange();
+    if (SemaRef.checkArgCount(TheCall, 2) ||
+        CheckResourceHandle(&SemaRef, TheCall, 0) ||
+        CheckArgTypeMatches(&SemaRef, TheCall->getArg(1),
+                            SemaRef.getASTContext().UnsignedIntTy))
       return true;
-    }
 
+    auto *ResourceTy = TheCall->getArg(0)
+                           ->getType()
+                           ->castAs<HLSLAttributedResourceType>();
     QualType ContainedTy = ResourceTy->getContainedType();
     // TODO: Map to an hlsl_device address space.
     TheCall->setType(getASTContext().getPointerType(ContainedTy));