[SER] Diagnose HitObject in unsupported declaration contexts

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

@@ -465,10 +465,6 @@ class CXXRecordDecl : public RecordDecl {
     /// \brief Whether we are currently parsing base specifiers.
     bool IsParsingBaseSpecifiers : 1;
 
-    /// \brief Whether this class contains at least one member or base
-    ///  class containing an HLSL vector longer than 4 elements.
-    bool HasHLSLLongVector : 1;
-
     /// \brief The number of base class specifiers in Bases.
     unsigned NumBases;
 
@@ -1022,13 +1018,6 @@ class CXXRecordDecl : public RecordDecl {
     return data().NeedOverloadResolutionForDestructor;
   }
 
-  // HLSL Change add HLSL Long vector bit.
-  /// \brief Determine whether this class contains an HLSL long vector
-  /// of over 4 elements.
-  bool hasHLSLLongVector() { return data().HasHLSLLongVector; }
-  /// \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 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

@@ -7884,7 +7884,7 @@ def err_hlsl_unsupported_long_vector
     "entry function parameters|entry function return type|"
     "patch constant function parameters|patch constant function return type|"
     "payload parameters|attributes}0 are not supported">;
-// %select options must be compatible with err_hlsl_unsupported_long_vector (same index used)
+// First %select options must match 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|"

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

@@ -61,6 +61,11 @@ bool DiagnoseNodeStructArgument(clang::Sema *self,
 
 // Keep this in sync with err_hlsl_unsupported_object in DiagnosticSemaKinds.td
 enum class TypeDiagContext {
+  // Indices that the type context is valid and no diagnostics should be emitted
+  // for this type category.
+  Valid = -1,
+  // Supported indices for both `err_hlsl_unsupported_object_context` and
+  // `err_hlsl_unsupported_long_vector`
   ConstantBuffersOrTextureBuffers = 0,
   TessellationPatches = 1,
   GeometryStreams = 2,
@@ -74,12 +79,16 @@ enum class TypeDiagContext {
   PayloadParameters = 10,
   Attributes = 11,
   TypeParameter = 12,
+  LongVecDiagMaxSelectIndex = TypeParameter,
+  // Below only supported for `err_hlsl_diag_unsupported_object_context`
   StructuredBuffers = 13,
   GlobalVariables = 14,
   GroupShared = 15,
+  DiagMaxSelectIndex = 15,
 };
 bool DiagnoseTypeElements(clang::Sema &S, clang::SourceLocation Loc,
-                          clang::QualType Ty, TypeDiagContext DiagContext,
+                          clang::QualType Ty, TypeDiagContext ObjDiagContext,
+                          TypeDiagContext LongVecDiagContext,
                           const clang::FieldDecl *FD = nullptr);
 
 void DiagnoseControlFlowConditionForHLSL(clang::Sema *self,

tools/clang/lib/AST/DeclCXX.cpp

@@ -72,8 +72,8 @@ CXXRecordDecl::DefinitionData::DefinitionData(CXXRecordDecl *D)
       ImplicitCopyAssignmentHasConstParam(true),
       HasDeclaredCopyConstructorWithConstParam(false),
       HasDeclaredCopyAssignmentWithConstParam(false), IsLambda(false),
-      IsParsingBaseSpecifiers(false), HasHLSLLongVector(false), NumBases(0),
-      NumVBases(0), Bases(), VBases(), Definition(D), FirstFriend() {}
+      IsParsingBaseSpecifiers(false), NumBases(0), NumVBases(0), Bases(),
+      VBases(), Definition(D), FirstFriend() {}
 // HLSL Change End - Add HasLongVector and clang-format
 
 CXXBaseSpecifier *CXXRecordDecl::DefinitionData::getBasesSlowCase() const {
@@ -203,11 +203,6 @@ CXXRecordDecl::setBases(CXXBaseSpecifier const * const *Bases,
     if (!BaseClassDecl->isStandardLayout())
       data().IsStandardLayout = false;
 
-    // HLSL Change Begin - Propagate presence of long vector to child classes.
-    if (BaseClassDecl->hasHLSLLongVector())
-      data().HasHLSLLongVector = true;
-    // HLSL Change End
-
     // Record if this base is the first non-literal field or base.
     if (!hasNonLiteralTypeFieldsOrBases() && !BaseType->isLiteralType(C))
       data().HasNonLiteralTypeFieldsOrBases = true;
@@ -389,11 +384,6 @@ void CXXRecordDecl::addedClassSubobject(CXXRecordDecl *Subobj) {
     data().NeedOverloadResolutionForMoveConstructor = true;
     data().NeedOverloadResolutionForDestructor = true;
   }
-
-  // HLSL Change Begin - Propagate presence of long vector to child classes.
-  if (Subobj->hasHLSLLongVector())
-    data().HasHLSLLongVector = true;
-  // HLSL Change End
 }
 
 /// Callback function for CXXRecordDecl::forallBases that acknowledges

tools/clang/lib/Sema/SemaDXR.cpp

@@ -827,8 +827,9 @@ void DiagnoseBuiltinCallWithPayload(Sema &S, const VarDecl *Payload,
   }
 
   // Verify that the payload type is legal
+  const TypeDiagContext DiagContext = TypeDiagContext::PayloadParameters;
   if (DiagnoseTypeElements(S, Payload->getLocation(), Payload->getType(),
-                           TypeDiagContext::PayloadParameters))
+                           DiagContext, DiagContext))
     return;
   if (!hlsl::IsHLSLCopyableAnnotatableRecord(Payload->getType())) {
     S.Diag(Payload->getLocation(), diag::err_payload_attrs_must_be_udt)
@@ -837,13 +838,6 @@ void DiagnoseBuiltinCallWithPayload(Sema &S, const VarDecl *Payload,
     return;
   }
 
-  if (ContainsLongVector(Payload->getType())) {
-    const unsigned PayloadParametersIdx = 10;
-    S.Diag(Payload->getLocation(), diag::err_hlsl_unsupported_long_vector)
-        << PayloadParametersIdx;
-    return;
-  }
-
   CollectNonAccessableFields(PayloadType, CallerStage, {}, {},
                              NonWriteableFields, NonReadableFields);