Split-off from LongVector diagnostics / Fold err_hlsl_node_record_object

and err_hlsl_objectintemplateargument

Author: simoll

tools/clang/include/clang/AST/DeclCXX.h

@@ -469,10 +469,6 @@ class CXXRecordDecl : public RecordDecl {
     ///  class containing an HLSL vector longer than 4 elements.
     bool HasHLSLLongVector : 1;
 
-    /// \brief Whether this class contains at least one member or base
-    ///  class containing an HLSL HitObject.
-    bool HasHLSLHitObject : 1;
-
     /// \brief The number of base class specifiers in Bases.
     unsigned NumBases;
 
@@ -1033,11 +1029,6 @@ class CXXRecordDecl : public RecordDecl {
   /// \brief Set that this class contains an HLSL long vector of over 4 elements
   bool setHasHLSLLongVector() { return data().HasHLSLLongVector = true; }
 
-  // \brief Determine whether this class contains an HLSL HitObject.
-  bool hasHLSLHitObject() { return data().HasHLSLHitObject; }
-  /// \brief Set that this class contains an HLSL HitObject.
-  bool setHasHLSLHitObject() { return data().HasHLSLHitObject = true; }
-
   /// \brief Determine whether this class describes a lambda function object.
   bool isLambda() const {
     // An update record can't turn a non-lambda into a lambda.

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

@@ -7558,8 +7558,6 @@ def err_hlsl_missing_type_specifier : Error< // Patterened after err_missing_typ
   "HLSL requires a type specifier for all declarations">;
 def err_hlsl_multiple_concrete_bases : Error<
   "multiple concrete base types specified">;
-def err_hlsl_objectintemplateargument : Error<
-  "%0 is an object and cannot be used as a type parameter">;
 def err_hlsl_packoffset_requires_cbuffer : Error<
   "packoffset is only allowed in a constant buffer">;
 def warn_hlsl_packoffset_mix : Warning<
@@ -7878,14 +7876,23 @@ def err_hlsl_load_from_mesh_out_arrays: Error<
    "output arrays of a mesh shader can not be read from">;
 def err_hlsl_out_indices_array_incorrect_access: Error<
    "a vector in out indices array must be accessed as a whole">;
-def err_hlsl_unsupported_type
-    : Error<"%select{vectors of over 4 elements|HitObjects}0 in "
+def err_hlsl_unsupported_long_vector
+    : Error<"vectors of over 4 elements in "
     "%select{ConstantBuffers or TextureBuffers|"
     "tessellation patches|geometry streams|node records|"
     "cbuffers or tbuffers|user-defined struct parameter|"
     "entry function parameters|entry function return type|"
     "patch constant function parameters|patch constant function return type|"
-    "payload parameters|attributes}1 are not supported">;
+    "payload parameters|attributes}0 are not supported">;
+// %select options must be compatible with err_hlsl_unsupported_long_vector (same index used)
+def err_hlsl_unsupported_object_context
+    : Error<"object '%0' is not allowed in "
+    "%select{ConstantBuffers or TextureBuffers|"
+    "tessellation patches|geometry streams|node records|"
+    "cbuffers or tbuffers|user-defined struct parameter|"
+    "entry function parameters|entry function return type|"
+    "patch constant function parameters|patch constant function return type|"
+    "payload parameters|attributes|type parameters|structured buffers|global variables|groupshared variables}1">;
 def err_hlsl_logical_binop_scalar : Error<
    "operands for short-circuiting logical binary operator must be scalar, for non-scalar types use '%select{and|or}0'">;
 def err_hlsl_ternary_scalar : Error<
@@ -7970,8 +7977,6 @@ def err_hlsl_too_many_node_inputs : Error<
    "Node shader '%0' may not have more than one input record">;
 def err_hlsl_node_record_type : Error<
    "%0 is not valid as a node record type - struct/class required">;
-def err_hlsl_node_record_object : Error<
-   "object %0 may not appear in a node record">;
 def err_hlsl_array_disallowed : Error<
    "%select{entry parameter|declaration}1 of type %0 may not be an array">;
 def err_hlsl_inputpatch_size: Error<

tools/clang/include/clang/Sema/SemaHLSL.h

@@ -59,6 +59,29 @@ bool DiagnoseNodeStructArgument(clang::Sema *self,
                                 clang::QualType ArgTy, bool &Empty,
                                 const clang::FieldDecl *FD = nullptr);
 
+// Keep this in sync with err_hlsl_unsupported_object in DiagnosticSemaKinds.td
+enum class TypeDiagContext {
+  ConstantBuffersOrTextureBuffers = 0,
+  TessellationPatches = 1,
+  GeometryStreams = 2,
+  NodeRecords = 3,
+  CBuffersOrTBuffers = 4,
+  UserDefinedStructParameter = 5,
+  EntryFunctionParameters = 6,
+  EntryFunctionReturnType = 7,
+  PatchConstantFunctionParameters = 8,
+  PatchConstantFunctionReturnType = 9,
+  PayloadParameters = 10,
+  Attributes = 11,
+  TypeParameter = 12,
+  StructuredBuffers = 13,
+  GlobalVariables = 14,
+  GroupShared = 15,
+};
+bool DiagnoseTypeElements(clang::Sema &S, clang::SourceLocation Loc,
+                          clang::QualType Ty, TypeDiagContext DiagContext,
+                          const clang::FieldDecl *FD = nullptr);
+
 void DiagnoseControlFlowConditionForHLSL(clang::Sema *self,
                                          clang::Expr *condExpr,
                                          llvm::StringRef StmtName);
@@ -129,14 +152,6 @@ unsigned CaculateInitListArraySizeForHLSL(clang::Sema *sema,
                                           const clang::QualType EltTy);
 
 bool ContainsLongVector(clang::QualType);
-bool ContainsHitObject(clang::QualType);
-
-/// \brief Determine if the given type contains a long vector or a hit object.
-/// \param QT The type to check.
-/// \param DiagTypeIdx The index of the type in the diagnostic message.
-/// \returns True if the type contains a long vector or a hit object, false
-/// otherwise.
-bool ContainsLongVecOrHitObject(clang::QualType QT, unsigned &DiagTypeIdx);
 
 bool IsConversionToLessOrEqualElements(clang::Sema *self,
                                        const clang::ExprResult &sourceExpr,

tools/clang/lib/AST/DeclCXX.cpp

@@ -72,9 +72,8 @@ CXXRecordDecl::DefinitionData::DefinitionData(CXXRecordDecl *D)
       ImplicitCopyAssignmentHasConstParam(true),
       HasDeclaredCopyConstructorWithConstParam(false),
       HasDeclaredCopyAssignmentWithConstParam(false), IsLambda(false),
-      IsParsingBaseSpecifiers(false), HasHLSLLongVector(false),
-      HasHLSLHitObject(false), NumBases(0), NumVBases(0), Bases(), VBases(),
-      Definition(D), FirstFriend() {}
+      IsParsingBaseSpecifiers(false), HasHLSLLongVector(false), NumBases(0),
+      NumVBases(0), Bases(), VBases(), Definition(D), FirstFriend() {}
 // HLSL Change End - Add HasLongVector and clang-format
 
 CXXBaseSpecifier *CXXRecordDecl::DefinitionData::getBasesSlowCase() const {
@@ -207,8 +206,6 @@ CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases,
     // HLSL Change Begin - Propagate presence of long vector to child classes.
     if (BaseClassDecl->hasHLSLLongVector())
       data().HasHLSLLongVector = true;
-    if (BaseClassDecl->hasHLSLHitObject())
-      data().HasHLSLHitObject = true;
     // HLSL Change End
 
     // Record if this base is the first non-literal field or base.
@@ -396,8 +393,6 @@ void CXXRecordDecl::addedClassSubobject(CXXRecordDecl *Subobj) {
   // HLSL Change Begin - Propagate presence of long vector to child classes.
   if (Subobj->hasHLSLLongVector())
     data().HasHLSLLongVector = true;
-  if (Subobj->hasHLSLHitObject())
-    data().HasHLSLHitObject = true;
   // HLSL Change End
 }
 

tools/clang/lib/AST/HlslTypes.cpp

@@ -113,6 +113,11 @@ bool IsHLSLNumericUserDefinedType(clang::QualType type) {
     for (auto member : RD->fields()) {
       if (!IsHLSLNumericOrAggregateOfNumericType(member->getType()))
         return false;
+      if (auto *Child = dyn_cast<CXXRecordDecl>(RD))
+        // Walk up the inheritance chain and check base class fields
+        for (auto &Base : Child->bases())
+          if (!IsHLSLNumericOrAggregateOfNumericType(Base.getType()))
+            return false;
     }
     return true;
   }
@@ -125,8 +130,6 @@ bool IsHLSLNumericUserDefinedType(clang::QualType type) {
 // which can't be annotated. But includes UDTs of trivially copyable data and
 // the builtin trivially copyable raytracing structs.
 bool IsHLSLCopyableAnnotatableRecord(clang::QualType QT) {
-  if (ContainsHitObject(QT))
-    return false;
   return IsHLSLNumericUserDefinedType(QT) ||
          IsHLSLBuiltinRayAttributeStruct(QT);
 }

tools/clang/lib/Sema/SemaDXR.cpp

@@ -827,6 +827,9 @@ void DiagnoseBuiltinCallWithPayload(Sema &S, const VarDecl *Payload,
   }
 
   // Verify that the payload type is legal
+  if (DiagnoseTypeElements(S, Payload->getLocation(), Payload->getType(),
+                           TypeDiagContext::PayloadParameters))
+    return;
   if (!hlsl::IsHLSLCopyableAnnotatableRecord(Payload->getType())) {
     S.Diag(Payload->getLocation(), diag::err_payload_attrs_must_be_udt)
         << /*payload|attributes|callable*/ 0 << /*parameter %2|type*/ 0
@@ -835,11 +838,9 @@ void DiagnoseBuiltinCallWithPayload(Sema &S, const VarDecl *Payload,
   }
 
   if (ContainsLongVector(Payload->getType())) {
-    // No need to check for HitObject, checked with payload diagnosis.
-    const unsigned LongVectorIdx = 0;
     const unsigned PayloadParametersIdx = 10;
-    S.Diag(Payload->getLocation(), diag::err_hlsl_unsupported_type)
-        << LongVectorIdx << PayloadParametersIdx;
+    S.Diag(Payload->getLocation(), diag::err_hlsl_unsupported_long_vector)
+        << PayloadParametersIdx;
     return;
   }
 

tools/clang/lib/Sema/SemaDecl.cpp

@@ -13247,16 +13247,10 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl,
   SmallVector<FieldDecl*, 32> RecFields;
 
   bool ARCErrReported = false;
-  bool HasHitObject = false;
   for (ArrayRef<Decl *>::iterator i = Fields.begin(), end = Fields.end();
        i != end; ++i) {
     FieldDecl *FD = cast<FieldDecl>(*i);
 
-    // HLSL Change Begin - set HitObject bit for fields
-    if (!HasHitObject && hlsl::ContainsHitObject(FD->getType()))
-      HasHitObject = true;
-    // HLSL Change End
-
     // Get the type for the field.
     const Type *FDTy = FD->getType().getTypePtr();
 
@@ -13445,12 +13439,7 @@ void Sema::ActOnFields(Scope *S, SourceLocation RecLoc, Decl *EnclosingDecl,
                I = CXXRecord->conversion_begin(),
                E = CXXRecord->conversion_end(); I != E; ++I)
           I.setAccess((*I)->getAccess());
-
-        // HLSL Change Begin - set HitObject bit for fields
-        if (HasHitObject)
-          CXXRecord->setHasHLSLHitObject();
-        // HLSL Change End
-
+        
         if (!CXXRecord->isDependentType()) {
           if (CXXRecord->hasUserDeclaredDestructor()) {
             // Adjust user-defined destructor exception spec.