detect subobjects in globals

Author: bob80905

tools/clang/lib/Sema/SemaHLSLDiagnoseTU.cpp

@@ -590,7 +590,6 @@ void hlsl::DiagnoseTranslationUnit(clang::Sema *self) {
 
   const auto *shaderModel =
       hlsl::ShaderModel::GetByName(self->getLangOpts().HLSLProfile.c_str());
-  DXIL::ShaderKind EntrySK = shaderModel->GetKind();
 
   llvm::SmallVector<VarDecl *, 16> GlobalsWithInit;
   GatherGlobalsWithInitializers(self->getASTContext().getTranslationUnitDecl(),
@@ -706,7 +705,7 @@ void hlsl::DiagnoseTranslationUnit(clang::Sema *self) {
             << PatchConstantFunctionReturnIdx;
       }
     }
-
+    DXIL::ShaderKind EntrySK = shaderModel->GetKind();
     DXIL::NodeLaunchType NodeLaunchTy = DXIL::NodeLaunchType::Invalid;
     if (EntrySK == DXIL::ShaderKind::Library) {
       // For library, check if the exported function is entry with shader
@@ -734,12 +733,12 @@ void hlsl::DiagnoseTranslationUnit(clang::Sema *self) {
       Visitor.TraverseDecl(FD);
   }
 
-  if (EntrySK == DXIL::ShaderKind::Library) {
+  if (shaderModel->GetKind() == DXIL::ShaderKind::Library) {
     for (VarDecl *VD : GlobalsWithInit) {
       DXIL::NodeLaunchType NodeLaunchTy = DXIL::NodeLaunchType::Invalid;
       HLSLReachableDiagnoseVisitor Visitor(
-          self, shaderModel, EntrySK, NodeLaunchTy, nullptr, DiagnosedCalls,
-          DeclAvailabilityChecked, DiagnosedTypeLocs);
+          self, shaderModel, shaderModel->GetKind(), NodeLaunchTy, nullptr,
+          DiagnosedCalls, DeclAvailabilityChecked, DiagnosedTypeLocs);
       QualType QT = VD->getType();
       if (const RecordType *RT = QT->getAs<RecordType>()) {
         RecordDecl *RD = RT->getDecl();
@@ -749,4 +748,4 @@ void hlsl::DiagnoseTranslationUnit(clang::Sema *self) {
       }
     }
   }
-}
+}

…heck/d3dreflect/rayquery-reflection.hlsl …3dreflect/raytracingpipelineconfig1.hlsltools/clang/test/HLSLFileCheck/d3dreflect/rayquery-reflection.hlsl renamed to tools/clang/test/HLSLFileCheck/d3dreflect/raytracingpipelineconfig1.hlsl tools/clang/test/HLSLFileCheck/d3dreflect/rayquery-reflection.hlsl renamed to tools/clang/test/HLSLFileCheck/d3dreflect/raytracingpipelineconfig1.hlsl

@@ -1,7 +1,6 @@
-// RUsN: %dxilver 1.9 | %dxc -T lib_6_9  %s | FileCheck %s
-// RUN: %dxilver 1.8 | %dxc -T lib_6_8 %s | FileCheck -check-prefix=UNDER69 %s
-// RUsN: %dxilver 1.9 | %dxc -T lib_6_9  -ast-dump %s | FileCheck -check-prefix=AST %s
-// RUsN: %dxilver 1.9 | %dxc -T lib_6_9  -ast-dump-implicit %s | FileCheck -check-prefix=ASTIMPL %s
+// RUN: %dxilver 1.9 | %dxc -T lib_6_9  %s | FileCheck %s
+// RUN: %dxilver 1.9 | %dxc -T lib_6_9 -ast-dump %s | FileCheck -check-prefix=AST %s
+// RUN: %dxilver 1.9 | %dxc -T lib_6_9 -ast-dump-implicit %s | FileCheck -check-prefix=ASTIMPL %s
 
 
 // CHECK: ; RaytracingPipelineConfig1 rpc = { MaxTraceRecursionDepth = 32, Flags = RAYTRACING_PIPELINE_FLAG_ALLOW_OPACITY_MICROMAPS };
@@ -18,6 +17,3 @@
 // ASTIMPL-NEXT: AvailabilityAttr 0x{{.+}} <<invalid sloc>> Implicit  6.9 0 0 ""
 
 RaytracingPipelineConfig1 rpc = { 32, RAYTRACING_PIPELINE_FLAG_ALLOW_OPACITY_MICROMAPS };
-
-// UNDER69: Potential misuse
-

tools/clang/test/SemaHLSL/raytracingpipelineconfig1-warnings.hlsl

@@ -0,0 +1,6 @@
+// RUN: %dxilver 1.8 | %dxc -T lib_6_8 -verify %s
+
+// expected-warning@+1{{potential misuse of built-in constant 'RAYTRACING_PIPELINE_FLAG_ALLOW_OPACITY_MICROMAPS' in shader model lib_6_8; introduced in shader model 6.9}} 
+RaytracingPipelineConfig1 rpc = { 32, RAYTRACING_PIPELINE_FLAG_ALLOW_OPACITY_MICROMAPS };
+
+