Disallow auto from infer types from ResourceDescriptorHeap and SamplerDescriptorHeap

tools/clang/include/clang/Basic/Attr.td

@@ -1196,6 +1196,17 @@ def HLSLHitObject : InheritableAttr {
   let Documentation = [Undocumented];
 }
 
+// HLSL Dynamic Resource Attribute
+// Marks the builtin `.Resource` / `.Sampler` placeholder record types used
+// for descriptor heap indexing (ResourceDescriptorHeap[i] /
+// SamplerDescriptorHeap[i]).
+def HLSLDynamicResource : InheritableAttr {
+  let Spellings = []; // No spellings!
+  let Args = [BoolArgument<"IsSampler">];
+  let Subjects = SubjectList<[CXXRecord]>;
+  let Documentation = [Undocumented];
+}
+
 // HLSL Parameter Attributes
 
 def HLSLMaxRecords : InheritableAttr {

tools/clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -8066,6 +8066,10 @@ def err_hlsl_linalg_unsupported_stage : Error<
 def err_hlsl_pointers_unsupported : Error<
   "%select{pointers|references}0 are unsupported in HLSL">;
 
+def err_hlsl_auto_descriptor_heap : Error<
+  "'auto' cannot deduce the type of '%select{ResourceDescriptorHeap|SamplerDescriptorHeap}0'; "
+  "use a specific resource or sampler type instead">;
+
 // HLSL Change Ends
 
 // SPIRV Change Starts

tools/clang/lib/AST/ASTContextHLSL.cpp

@@ -1319,6 +1319,8 @@ CXXRecordDecl *hlsl::DeclareResourceType(ASTContext &context, bool bSampler) {
   typeDeclBuilder.addField("h", GetHLSLObjectHandleType(context));
 
   CXXRecordDecl *recordDecl = typeDeclBuilder.getRecordDecl();
+  recordDecl->addAttr(
+      HLSLDynamicResourceAttr::CreateImplicit(context, bSampler));
 
   QualType indexType = context.UnsignedIntTy;
   QualType resultType = context.getRecordType(recordDecl);

tools/clang/lib/AST/HlslTypes.cpp

@@ -544,18 +544,16 @@ bool IsHLSLNodeInputType(clang::QualType type) {
 }
 
 bool IsHLSLDynamicResourceType(clang::QualType type) {
-  if (const RecordType *RT = type->getAs<RecordType>()) {
-    StringRef name = RT->getDecl()->getName();
-    return name == ".Resource";
-  }
+  if (const HLSLDynamicResourceAttr *Attr =
+          getAttr<HLSLDynamicResourceAttr>(type))
+    return !Attr->getIsSampler();
   return false;
 }
 
 bool IsHLSLDynamicSamplerType(clang::QualType type) {
-  if (const RecordType *RT = type->getAs<RecordType>()) {
-    StringRef name = RT->getDecl()->getName();
-    return name == ".Sampler";
-  }
+  if (const HLSLDynamicResourceAttr *Attr =
+          getAttr<HLSLDynamicResourceAttr>(type))
+    return Attr->getIsSampler();
   return false;
 }
 

tools/clang/lib/Sema/SemaDecl.cpp

@@ -13,6 +13,7 @@
 
 #include "TypeLocBuilder.h"
 #include "dxc/DXIL/DxilSemantic.h" // HLSL Change
+#include "dxc/HlslIntrinsicOp.h"   // HLSL Change
 #include "clang/AST/ASTConsumer.h"
 #include "clang/AST/ASTContext.h"
 #include "clang/AST/ASTLambda.h"
@@ -6417,6 +6418,21 @@ static bool checkForConflictWithNonVisibleExternC(Sema &S, const T *ND,
   return false;
 }
 
+static bool IsDynamicHeapInitializer(const Expr *Init, bool &IsSampler) {
+  if (!Init)
+    return false;
+  QualType T = Init->IgnoreParenImpCasts()->getType();
+  if (hlsl::IsHLSLDynamicSamplerType(T)) {
+    IsSampler = true;
+    return true;
+  }
+  if (hlsl::IsHLSLDynamicResourceType(T)) {
+    IsSampler = false;
+    return true;
+  }
+  return false;
+}
+
 void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
   // If the decl is already known invalid, don't check it.
   if (NewVD->isInvalidDecl())
@@ -9026,6 +9042,17 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init,
       RealDecl->setInvalidDecl();
       return;
     }
+
+    if (getLangOpts().HLSL) {
+      bool IsSampler = false;
+      if (IsDynamicHeapInitializer(DeduceInit, IsSampler)) {
+        Diag(VDecl->getLocation(), diag::err_hlsl_auto_descriptor_heap)
+            << IsSampler;
+        VDecl->setInvalidDecl();
+        return;
+      }
+    }
+
     VDecl->setType(DeducedType);
     assert(VDecl->isLinkageValid());
 

tools/clang/test/HLSLFileCheck/hlsl/intrinsics/createHandleFromHeap/dynamic-resource-ast.hlsl

@@ -0,0 +1,14 @@
+// RUN: %dxc -T ps_6_6 -ast-dump-implicit %s | FileCheck %s
+
+
+float4 main(float4 pos : SV_Position) : SV_Target {
+  Texture2D<float4> tex = ResourceDescriptorHeap[0];
+  SamplerState samp = SamplerDescriptorHeap[0];
+  return tex.Sample(samp, pos.xy);
+}
+
+// CHECK: CXXRecordDecl {{0x[0-9a-fA-F]+}} <<invalid sloc>> <invalid sloc> implicit struct .Resource definition
+// CHECK: HLSLDynamicResourceAttr {{0x[0-9a-fA-F]+}} <<invalid sloc>> Implicit
+
+// CHECK: CXXRecordDecl {{0x[0-9a-fA-F]+}} <<invalid sloc>> <invalid sloc> implicit struct .Sampler definition
+// CHECK: HLSLDynamicResourceAttr {{0x[0-9a-fA-F]+}} <<invalid sloc>> Implicit IsSampler

tools/clang/test/HLSLFileCheckLit/hlsl/auto/auto-no-descriptor-heap.hlsl

@@ -0,0 +1,27 @@
+// RUN: %dxc -T ps_6_6 -HV 202x -verify %s
+
+
+int someFunc() { return 7; }
+
+float4 main(float4 pos : SV_Position) : SV_Target {
+    // expected-error@+1 {{'auto' cannot deduce the type of 'ResourceDescriptorHeap'}}
+    auto tex = ResourceDescriptorHeap[0];
+    // expected-error@+1 {{'auto' cannot deduce the type of 'SamplerDescriptorHeap'}}
+    auto samp = SamplerDescriptorHeap[0];
+
+    // expected-error@+1 {{'auto' cannot deduce the type of 'ResourceDescriptorHeap'}}
+    auto heap = ResourceDescriptorHeap;
+    // expected-error@+1 {{'auto' cannot deduce the type of 'SamplerDescriptorHeap'}}
+    auto sheap = SamplerDescriptorHeap;
+
+    // expected-error@+1 {{'auto' cannot deduce the type of 'SamplerDescriptorHeap'}}
+    auto pSamp = (SamplerDescriptorHeap[0]);
+    // expected-error@+1 {{'auto' cannot deduce the type of 'ResourceDescriptorHeap'}}
+    auto pHeap = (ResourceDescriptorHeap);
+
+    // Negative case
+    Texture2D<float4> tex2 = ResourceDescriptorHeap[1];
+    auto sampled = tex2.Sample((SamplerState)SamplerDescriptorHeap[0], pos.xy);
+
+    return float4(0, 0, 0, 0);
+}