Remove resource handle from HLSLBufDecl, cleanup tests

hekota · hekota · commit 07ec28399bbe · 2025-01-14T12:31:48.000-08:00
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
@@ -4967,7 +4967,6 @@ class HLSLBufferDecl final : public NamedDecl, public DeclContext {
   SourceLocation getRBraceLoc() const { return RBraceLoc; }
   void setRBraceLoc(SourceLocation L) { RBraceLoc = L; }
   bool isCBuffer() const { return IsCBuffer; }
-  const Type *getResourceHandleType() const;
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { return classofKind(D->getKind()); }
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
@@ -5693,19 +5693,6 @@ HLSLBufferDecl *HLSLBufferDecl::CreateDeserialized(ASTContext &C,
                                     SourceLocation(), SourceLocation());
 }
 
-const Type *HLSLBufferDecl::getResourceHandleType() const {
-  // Resource handle is the last decl in the HLSLBufferDecl.
-  // If it is not present, it probably means the buffer is empty.
-  if (VarDecl *VD = llvm::dyn_cast_or_null<VarDecl>(LastDecl)) {
-    const Type *Ty = VD->getType().getTypePtr();
-    if (Ty->isHLSLAttributedResourceType()) {
-      assert(VD->getNameAsString() == "__handle");
-      return Ty;
-    }
-  }
-  return nullptr;
-}
-
 //===----------------------------------------------------------------------===//
 // ImportDecl Implementation
 //===----------------------------------------------------------------------===//
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.cpp b/clang/lib/CodeGen/CGHLSLRuntime.cpp
@@ -159,12 +159,10 @@ void CGHLSLRuntime::addConstant(VarDecl *D, Buffer &CB) {
   CB.Constants.emplace_back(std::make_pair(GV, LowerBound));
 }
 
-void CGHLSLRuntime::addBufferDecls(const HLSLBufferDecl *D, Buffer &CB) {
-  for (Decl *it : D->decls()) {
+void CGHLSLRuntime::addBufferDecls(const DeclContext *DC, Buffer &CB) {
+  for (Decl *it : DC->decls()) {
     if (auto *ConstDecl = dyn_cast<VarDecl>(it)) {
-      if (ConstDecl->getType().getTypePtr() != D->getResourceHandleType()) {
-        addConstant(ConstDecl, CB);
-      }
+      addConstant(ConstDecl, CB);
     } else if (isa<CXXRecordDecl, EmptyDecl>(it)) {
       // Nothing to do for this declaration.
     } else if (isa<FunctionDecl>(it)) {
diff --git a/clang/lib/CodeGen/CGHLSLRuntime.h b/clang/lib/CodeGen/CGHLSLRuntime.h
@@ -169,7 +169,7 @@ class CGHLSLRuntime {
                                    llvm::hlsl::ElementType ET,
                                    BufferResBinding &Binding);
   void addConstant(VarDecl *D, Buffer &CB);
-  void addBufferDecls(const HLSLBufferDecl *D, Buffer &CB);
+  void addBufferDecls(const DeclContext *D, Buffer &CB);
   llvm::Triple::ArchType getArch();
   llvm::SmallVector<Buffer> Buffers;
 
diff --git a/clang/lib/Sema/SemaHLSL.cpp b/clang/lib/Sema/SemaHLSL.cpp
@@ -469,27 +469,6 @@ static CXXRecordDecl *createHostLayoutStructForBuffer(Sema &S,
   return LS;
 }
 
-// Creates a "__handle" declaration for the HLSL Buffer type
-// with the corresponding HLSL resource type and adds it to the HLSLBufferDecl
-static void createHLSLBufferHandle(Sema &S, HLSLBufferDecl *BufDecl,
-                                   CXXRecordDecl *LayoutStruct) {
-  ASTContext &AST = S.getASTContext();
-
-  HLSLAttributedResourceType::Attributes ResAttrs(
-      BufDecl->isCBuffer() ? ResourceClass::CBuffer : ResourceClass::SRV, false,
-      false);
-  QualType ResHandleTy = AST.getHLSLAttributedResourceType(
-      AST.HLSLResourceTy, QualType(LayoutStruct->getTypeForDecl(), 0),
-      ResAttrs);
-
-  IdentifierInfo *II = &AST.Idents.get("__handle", tok::TokenKind::identifier);
-  VarDecl *VD = VarDecl::Create(
-      BufDecl->getASTContext(), BufDecl, SourceLocation(), SourceLocation(), II,
-      ResHandleTy, AST.getTrivialTypeSourceInfo(ResHandleTy, SourceLocation()),
-      SC_None);
-  BufDecl->addDecl(VD);
-}
-
 // Handle end of cbuffer/tbuffer declaration
 void SemaHLSL::ActOnFinishBuffer(Decl *Dcl, SourceLocation RBrace) {
   auto *BufDecl = cast<HLSLBufferDecl>(Dcl);
@@ -501,9 +480,6 @@ void SemaHLSL::ActOnFinishBuffer(Decl *Dcl, SourceLocation RBrace) {
   CXXRecordDecl *LayoutStruct =
       createHostLayoutStructForBuffer(SemaRef, BufDecl);
 
-  // create buffer resource handle
-  createHLSLBufferHandle(SemaRef, BufDecl, LayoutStruct);
-
   SemaRef.PopDeclContext();
 }
 
diff --git a/clang/test/AST/HLSL/ast-dump-comment-cbuffe-tbufferr.hlsl b/clang/test/AST/HLSL/ast-dump-comment-cbuffe-tbufferr.hlsl
diff --git a/clang/test/AST/HLSL/ast-dump-comment-cbuffer-tbuffer.hlsl b/clang/test/AST/HLSL/ast-dump-comment-cbuffer-tbuffer.hlsl
@@ -0,0 +1,62 @@
+// RUN: %clang_cc1 -Wdocumentation -ast-dump=json -x hlsl -triple dxil-pc-shadermodel6.3-library %s | FileCheck %s --check-prefix=JSON
+// RUN: %clang_cc1 -Wdocumentation -ast-dump -x hlsl -triple dxil-pc-shadermodel6.3-library %s | FileCheck %s --check-prefix=AST
+
+// JSON:"kind": "HLSLBufferDecl",
+// JSON:"name": "A",
+// JSON-NEXT:"bufferKind": "cbuffer",
+// JSON:"kind": "TextComment",
+// JSON:"text": " CBuffer decl."
+
+/// CBuffer decl.
+cbuffer A {
+    // JSON: "kind": "VarDecl",
+    // JSON: "name": "a",
+    // JSON: "qualType": "float"
+    float a;
+    // JSON: "kind": "VarDecl",
+    // JSON: "name": "b",
+    // JSON: "qualType": "int"
+    int b;
+}
+
+// JSON:"kind": "HLSLBufferDecl",
+// JSON:"name": "B",
+// JSON-NEXT:"bufferKind": "tbuffer",
+// JSON:"kind": "TextComment",
+// JSON:"text": " TBuffer decl."
+
+/// TBuffer decl.
+tbuffer B {
+    // JSON: "kind": "VarDecl",
+    // JSON: "name": "c",
+    // JSON: "qualType": "float"
+    float c;
+    // JSON: "kind": "VarDecl",
+    // JSON: "name": "d",
+    // JSON: "qualType": "int"
+    int d;
+}
+
+// AST: HLSLBufferDecl {{.*}} line:11:9 cbuffer A
+// AST-NEXT: HLSLResourceClassAttr {{.*}} Implicit CBuffer
+// AST-NEXT: HLSLResourceAttr {{.*}} Implicit CBuffer
+// AST-NEXT: FullComment
+// AST-NEXT: ParagraphComment
+// AST-NEXT: TextComment {{.*}} Text=" CBuffer decl."
+// AST-NEXT: VarDecl {{.*}} a 'float'
+// AST-NEXT: VarDecl {{.*}} b 'int'
+// AST-NEXT: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.A definition
+// AST: FieldDecl {{.*}} a 'float'
+// AST-NEXT: FieldDecl {{.*}} b 'int'
+
+// AST-NEXT: HLSLBufferDecl {{.*}} line:29:9 tbuffer B
+// AST-NEXT: HLSLResourceClassAttr {{.*}} Implicit SRV
+// AST-NEXT: HLSLResourceAttr {{.*}} Implicit TBuffer
+// AST-NEXT: FullComment
+// AST-NEXT: ParagraphComment
+// AST-NEXT: TextComment {{.*}} Text=" TBuffer decl."
+// AST-NEXT: VarDecl {{.*}} c 'float'
+// AST-NEXT: VarDecl {{.*}} d 'int'
+// AST-NEXT: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.B definition
+// AST: FieldDecl {{.*}} c 'float'
+// AST-NEXT: FieldDecl {{.*}} d 'int'
diff --git a/clang/test/AST/HLSL/cbuffer.hlsl b/clang/test/AST/HLSL/cbuffer.hlsl
@@ -41,15 +41,12 @@ typedef float EmptyArrayTypedef[10][0];
 cbuffer CB {
   // CHECK: VarDecl {{.*}} col:9 used a1 'float'
   float a1;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB definition
   // CHECK: FieldDecl {{.*}} a1 'float'
-  // CHECK: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB)]]'
 }
 
 // Check that buffer layout struct does not include resources or empty types 
-// CHECK: HLSLBufferDecl {{.*}} line:55:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:52:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
@@ -63,16 +60,13 @@ cbuffer CB {
   float d2[0];
   // CHECK: VarDecl {{.*}} col:9 e2 'float'
   float e2;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB.1 definition
   // CHECK: FieldDecl {{.*}} a2 'float'
   // CHECK-NEXT: FieldDecl {{.*}} e2 'float'
-  // CHECK: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.1)]]'
 }
 
 // Check that layout struct is created for B and the empty struct C is removed
-// CHECK: HLSLBufferDecl {{.*}} line:78:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:72:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
@@ -82,60 +76,47 @@ cbuffer CB {
   B s2;
   // CHECK: VarDecl {{.*}} col:12 s3 'CTypedef':'C
   CTypedef s3;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.B definition
   // CHECK: FieldDecl {{.*}} a 'float'
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB.2 definition
   // CHECK: FieldDecl {{.*}} s1 'A'
   // CHECK: FieldDecl {{.*}} s2 '__hostlayout.struct.B'
-  // CHECK-NEXT: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.2)]]'
 }
 
 // check that layout struct is created for D because of its base struct
-// CHECK: HLSLBufferDecl {{.*}} line:100:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:90:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
   // CHECK: VarDecl {{.*}} s4 'D'
   D s4;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.D definition
   // CHECK: FieldDecl {{.*}} b 'float'
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB.3 definition
   // CHECK: FieldDecl {{.*}} s4 '__hostlayout.struct.D'
-  // CHECK: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.3)]]'
 }
 
 // check that layout struct is created for E because because its base struct
 // is empty and should be eliminated, and BTypedef should reuse the previously
 // defined '__hostlayout.struct.B' 
-// CHECK: HLSLBufferDecl {{.*}} line:119:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:105:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
   // CHECK: VarDecl {{.*}}  s5 'E'
   E s5;
   // CHECK: VarDecl {{.*}} s6 'BTypedef':'B'
   BTypedef s6;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.E definition
   // CHECK: FieldDecl {{.*}} c 'float'
-
   // CHECK-NOT: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.B definition
-
   // CHECK: CXXRecordDecl {{.*}}  implicit class __hostlayout.struct.CB.4 definition
   // CHECK: FieldDecl {{.*}} s5 '__hostlayout.struct.E'
   // CHECK: FieldDecl {{.*}} s6 '__hostlayout.struct.B'
-  // CHECK: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.4)]]'
 }
 
 // check that this produces empty layout struct
-// CHECK: HLSLBufferDecl {{.*}} line:141:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:122:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
@@ -149,32 +130,25 @@ cbuffer CB {
   RWBuffer<float> Buf;
   // CHECK: VarDecl {{.*}} ea 'EmptyArrayTypedef':'float[10][0]'
   EmptyArrayTypedef ea;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB.5 definition
   // CHECK-NOT: FieldDecl
-  // CHECK: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.5)]]'
 }
 
 // check host layout struct with compatible base struct
-// CHECK: HLSLBufferDecl {{.*}} line:163:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:141:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
   // CHECK: VarDecl {{.*}} s8 'F'
   F s8;
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.F definition
   // CHECK: public 'A'
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB.6 definition
   // CHECK: FieldDecl {{.*}} s8 '__hostlayout.struct.F'
-  // CHECK: VarDecl  {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL}: [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.6)]]'
 }
 
 // anonymous structs
-// CHECK: HLSLBufferDecl {{.*}} line:180:9 cbuffer CB
+// CHECK: HLSLBufferDecl {{.*}} line:154:9 cbuffer CB
 // CHECK: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK: HLSLResourceAttr {{.*}} Implicit CBuffer
 cbuffer CB {
@@ -187,31 +161,25 @@ cbuffer CB {
     // CHECK: FieldDecl {{.*}} f 'RWBuffer<float>':'hlsl::RWBuffer<float>'
     RWBuffer<float> f;
   } s9;
-  // CHECK: VarDecl {{.*}} s9 'struct (unnamed struct at {{.*}}cbuffer.hlsl:182:3
-  
+  // CHECK: VarDecl {{.*}} s9 'struct (unnamed struct at {{.*}}cbuffer.hlsl:156:3
   // CHECK: CXXRecordDecl {{.*}} struct definition
   struct {
     // CHECK: FieldDecl {{.*}} g 'int'
     int g;
     // CHECK: FieldDecl {{.*}} f 'RWBuffer<float>':'hlsl::RWBuffer<float>'
     RWBuffer<float> f;
   } s10;
-  // CHECK: VarDecl {{.*}} s10 'struct (unnamed struct at {{.*}}cbuffer.hlsl:193:3
-
+  // CHECK: VarDecl {{.*}} s10 'struct (unnamed struct at {{.*}}cbuffer.hlsl:166:3
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.anon definition
   // CHECK: FieldDecl {{.*}} e 'float'
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.anon.1 definition
   // CHECK: FieldDecl {{.*}} g 'int'
-
   // CHECK: CXXRecordDecl {{.*}} implicit class __hostlayout.struct.CB.7 definition
   // CHECK: FieldDecl {{.*}} s9 '__hostlayout.struct.anon'
   // CHECK: FieldDecl {{.*}} s10 '__hostlayout.struct.anon.1'
-  // CHECK-NEXT: VarDecl {{.*}} __handle '__hlsl_resource_t
-  // CHECK-SAME{LITERAL} [[hlsl::resource_class(CBuffer)]] [[hlsl::contained_type(__hostlayout.struct.CB.7)]]'
 }
 
-// Add uses for the constant buffer declarations so they are not optimized awayexport 
+// Add uses for the constant buffer declarations so they are not optimized away
 export float foo() {
   return a1 + a2 + s1.a + s4.b + s5.c + s8.a + s9.e;
 }
diff --git a/clang/test/AST/HLSL/pch_hlsl_buffer.hlsl b/clang/test/AST/HLSL/pch_hlsl_buffer.hlsl
