Removed global flag

Author: Przemog1

tools/clang/include/clang/AST/ASTContext.h

@@ -2408,7 +2408,7 @@ class ASTContext : public RefCountedBase<ASTContext> {
   /// It is normally invoked after ASTContext construction.
   ///
   /// \param Target The target 
-  void InitBuiltinTypes(const TargetInfo &Target);
+  void InitBuiltinTypes(const TargetInfo &Target, bool ignoreHLSLIntrinsics);
 
 private:
   void InitBuiltinType(CanQualType &R, BuiltinType::Kind K);

tools/clang/include/clang/AST/HlslTypes.h

@@ -51,7 +51,8 @@ namespace hlsl {
 
 /// <summary>Initializes the specified context to support HLSL
 /// compilation.</summary>
-void InitializeASTContextForHLSL(clang::ASTContext &context);
+void InitializeASTContextForHLSL(clang::ASTContext &context,
+                                 bool ignoreHLSLIntrinsics);
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Type system enumerations.

tools/clang/include/clang/Frontend/CompilerInstance.h

@@ -669,7 +669,7 @@ class CompilerInstance : public ModuleLoader {
   std::string getSpecificModuleCachePath();
 
   /// Create the AST context.
-  void createASTContext();
+  void createASTContext(bool ignoreHLSLIntrinsics = false);
 
   /// Create an external AST source to read a PCH file and attach it to the AST
   /// context.

tools/clang/include/clang/Frontend/FrontendAction.h

@@ -208,7 +208,8 @@ class FrontendAction {
   ///
   /// \return True on success; on failure the compilation of this file should
   /// be aborted and neither Execute() nor EndSourceFile() should be called.
-  bool BeginSourceFile(CompilerInstance &CI, const FrontendInputFile &Input);
+  bool BeginSourceFile(CompilerInstance &CI, const FrontendInputFile &Input,
+                       bool ignoreHLSLIntrinsics = false);
 
   /// \brief Set the source manager's main input file, and run the action.
   bool Execute();

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

@@ -24,19 +24,6 @@
 #include "clang/Sema/Template.h"
 #include "clang/Sema/TemplateDeduction.h"
 
-#include <optional>
-extern std::optional<bool> disableHLSLIntrinsicsGlobalVariableBecauseIDontCare;
-
-inline bool shouldDisableHLSLIntrinsics()
-{
-  assert(disableHLSLIntrinsicsGlobalVariableBecauseIDontCare.has_value());
-
-  if (!disableHLSLIntrinsicsGlobalVariableBecauseIDontCare.has_value())
-    exit(-1);
-
-  return disableHLSLIntrinsicsGlobalVariableBecauseIDontCare.value();
-}
-
 // Forward declarations.
 struct IDxcIntrinsicTable;
 namespace clang {

tools/clang/lib/AST/ASTContext.cpp

@@ -958,7 +958,7 @@ void ASTContext::InitBuiltinType(CanQualType &R, BuiltinType::Kind K) {
   Types.push_back(Ty);
 }
 
-void ASTContext::InitBuiltinTypes(const TargetInfo &Target) {
+void ASTContext::InitBuiltinTypes(const TargetInfo &Target, bool ignoreHLSLIntrinsics) {
   assert((!this->Target || this->Target == &Target) &&
          "Incorrect target reinitialization");
   assert(VoidTy.isNull() && "Context reinitialized?");
@@ -1108,7 +1108,7 @@ void ASTContext::InitBuiltinTypes(const TargetInfo &Target) {
 
     HLSLStringTy = this->getPointerType(CharTy);
 
-    hlsl::InitializeASTContextForHLSL(*this); // Previously in constructor, guarded by !DelayInitialization
+    hlsl::InitializeASTContextForHLSL(*this, ignoreHLSLIntrinsics); // Previously in constructor, guarded by !DelayInitialization
   }
   // HLSL Change Ends
 }

tools/clang/lib/Frontend/CompilerInstance.cpp

@@ -409,12 +409,12 @@ std::string CompilerInstance::getSpecificModuleCachePath() {
 
 // ASTContext
 
-void CompilerInstance::createASTContext() {
+void CompilerInstance::createASTContext(bool ignoreHLSLIntrinsics) {
   Preprocessor &PP = getPreprocessor();
   Context = new ASTContext(getLangOpts(), PP.getSourceManager(),
                            PP.getIdentifierTable(), PP.getSelectorTable(),
                            PP.getBuiltinInfo());
-  Context->InitBuiltinTypes(getTarget());
+  Context->InitBuiltinTypes(getTarget(), ignoreHLSLIntrinsics);
 }
 
 // ExternalASTSource

tools/clang/lib/Frontend/FrontendAction.cpp

@@ -173,7 +173,8 @@ FrontendAction::CreateWrappedASTConsumer(CompilerInstance &CI,
 }
 
 bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
-                                     const FrontendInputFile &Input) {
+                                     const FrontendInputFile &Input,
+                                     bool ignoreHLSLIntrinsics) {
   assert(!Instance && "Already processing a source file!");
   assert(!Input.isEmpty() && "Unexpected empty filename!");
   setCurrentInput(Input);
@@ -323,7 +324,7 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI,
   if (!usesPreprocessorOnly()) {
     // Parsing a model file should reuse the existing ASTContext.
     if (!isModelParsingAction())
-      CI.createASTContext();
+      CI.createASTContext(ignoreHLSLIntrinsics);
 
     std::unique_ptr<ASTConsumer> Consumer =
         CreateWrappedASTConsumer(CI, InputFile);

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -53,8 +53,6 @@
 #include <bitset>
 #include <float.h>
 
-std::optional<bool> disableHLSLIntrinsicsGlobalVariableBecauseIDontCare = std::nullopt;
-
 enum ArBasicKind {
   AR_BASIC_BOOL,
   AR_BASIC_LITERAL_FLOAT,
@@ -2996,6 +2994,9 @@ static TypedefDecl *CreateGlobalTypedef(ASTContext *context, const char *ident,
 
 class HLSLExternalSource : public ExternalSemaSource {
 private:
+
+    const bool m_disableHLSLIntrinsics;
+
   // Inner types.
   struct FindStructBasicTypeResult {
     ArBasicKind Kind; // Kind of struct (eg, AR_OBJECT_TEXTURE2D)
@@ -4115,13 +4116,14 @@ class HLSLExternalSource : public ExternalSemaSource {
   }
 
 public:
-  HLSLExternalSource()
+  HLSLExternalSource(bool disableHLSLIntrinsics)
       : m_matrixTemplateDecl(nullptr), m_vectorTemplateDecl(nullptr),
         m_vkIntegralConstantTemplateDecl(nullptr),
         m_vkLiteralTemplateDecl(nullptr),
         m_vkBufferPointerTemplateDecl(nullptr), m_hlslNSDecl(nullptr),
         m_vkNSDecl(nullptr), m_dxNSDecl(nullptr), m_context(nullptr),
-        m_sema(nullptr), m_hlslStringTypedef(nullptr) {
+        m_sema(nullptr), m_hlslStringTypedef(nullptr),
+        m_disableHLSLIntrinsics(disableHLSLIntrinsics) {
     memset(m_matrixTypes, 0, sizeof(m_matrixTypes));
     memset(m_matrixShorthandTypes, 0, sizeof(m_matrixShorthandTypes));
     memset(m_vectorTypes, 0, sizeof(m_vectorTypes));
@@ -5133,8 +5135,11 @@ class HLSLExternalSource : public ExternalSemaSource {
   bool IsValidObjectElement(LPCSTR tableName, IntrinsicOp op,
                             QualType objectElement);
 
-  static bool checkIfIntrinsicIsAllowed(StringRef intrinsicNameIdentifier)
+  bool checkIfIntrinsicIsAllowed(StringRef intrinsicNameIdentifier)
   {
+    if (!m_disableHLSLIntrinsics)
+      return true;
+
     static const std::unordered_set<std::string> allowedHLSLIntrinsics = {
         "Abort",
         "AcceptHitAndEndSearch",
@@ -5220,10 +5225,7 @@ class HLSLExternalSource : public ExternalSemaSource {
         "TraceRay",
         "TraceRayInline",
         "WorldRayDirection",
-        "WorldRayOrigin",
-        "WorldToObject",
-        "WorldToObject3x4",
-        "WorldToObject4x3"
+        "WorldRayOrigin"
     };
 
     auto it = allowedHLSLIntrinsics.find(std::string(intrinsicNameIdentifier));
@@ -5237,7 +5239,7 @@ class HLSLExternalSource : public ExternalSemaSource {
                                                   StringRef nameIdentifier,
                                                   size_t argumentCount) {
     // TODO: only check if the flag "devsh-disable-hlsl-intrinsics" is enabled
-    if (shouldDisableHLSLIntrinsics() && !checkIfIntrinsicIsAllowed(nameIdentifier))
+    if (!checkIfIntrinsicIsAllowed(nameIdentifier))
     {
       return IntrinsicDefIter::CreateStart(
           table, tableSize, table + tableSize,
@@ -13560,8 +13562,8 @@ hlsl::TrySubscriptIndexInitialization(clang::Sema *self, clang::Expr *SrcExpr,
 
 /// <summary>Performs HLSL-specific initialization on the specified
 /// context.</summary>
-void hlsl::InitializeASTContextForHLSL(ASTContext &context) {
-  HLSLExternalSource *hlslSource = new HLSLExternalSource();
+void hlsl::InitializeASTContextForHLSL(ASTContext &context, bool ignoreHLSLIntrinsics) {
+  HLSLExternalSource *hlslSource = new HLSLExternalSource(ignoreHLSLIntrinsics);
   IntrusiveRefCntPtr<ExternalASTSource> externalSource(hlslSource);
   if (hlslSource->Initialize(context)) {
     context.setExternalSource(externalSource);

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -628,8 +628,6 @@ class DxcCompiler : public IDxcCompiler3,
             static_cast<const char *>(pOrigUtf8Source->GetStringPointer()),
             pOrigUtf8Source->GetStringLength());
 
-        disableHLSLIntrinsicsGlobalVariableBecauseIDontCare = opts.SpirvOptions.devshDisableHLSLIntrinsics;
-
         CComPtr<IDxcResult> pSrcCodeResult;
         std::vector<LPCWSTR> PreprocessArgs;
         PreprocessArgs.reserve(argCount + 1);
@@ -968,7 +966,8 @@ class DxcCompiler : public IDxcCompiler3,
         compiler.getCodeGenOpts().SpirvOptions = opts.SpirvOptions;
         clang::EmitSpirvAction action;
         FrontendInputFile file(pUtf8SourceName, IK_HLSL);
-        action.BeginSourceFile(compiler, file);
+        action.BeginSourceFile(
+            compiler, file, opts.SpirvOptions.devshDisableHLSLIntrinsics);
         action.Execute();
         action.EndSourceFile();
         outStream.flush();