do not inherit from DxcDllSupport

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -1,38 +1,43 @@
 #include "dxc/Support/dxcapi.use.h"
 #include <string>
 
-class DxcDllExtValidationSupport : public dxc::DxcDllSupport {
-  // DxcDllExtValidationSupport manages the
-  // lifetime of dxcompiler.dll, while the member, DxilSupport,
+namespace dxc {
+class DxcDllExtValidationSupport {
+  // DxcompilerSupport manages the
+  // lifetime of dxcompiler.dll, while DxilExtValSupport
   // manages the lifetime of dxil.dll
 protected:
-  dxc::DxcDllSupport DxilSupport;
+  dxc::DxcDllSupport DxcompilerSupport;
+  dxc::DxcDllSupport DxilExtValSupport;
 
   std::string DxilDllPath;
 
-  // override DxcDllSupport's implementation of InitializeInternal,
-  // adding the environment variable value check for a path to a dxil.dll
-  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName) override;
-
 public:
   std::string GetDxilDllPath() { return DxilDllPath; }
   bool DxilDllFailedToLoad() {
-    return !DxilDllPath.empty() && !DxilSupport.IsEnabled();
+    return !DxilDllPath.empty() && !DxilExtValSupport.IsEnabled();
   }
 
-  void Cleanup() override {
-    DxilSupport.Cleanup();
-    DxcDllSupport::Cleanup();
+  void Cleanup() {
+    DxilExtValSupport.Cleanup();
+    DxcompilerSupport.Cleanup();
   }
 
-  HMODULE Detach() override {
+  HMODULE Detach() {
     // Can't Detach and return a handle for DxilSupport. Cleanup() instead.
-    DxilSupport.Cleanup();
-    return DxcDllSupport::Detach();
+    DxilExtValSupport.Cleanup();
+    return DxcompilerSupport.Detach();
   }
 
-  HRESULT CreateInstance(REFCLSID clsid, REFIID riid,
-                         IUnknown **pResult) override;
+  HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult);
   HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
-                          IUnknown **pResult) override;
+                          IUnknown **pResult);
+
+  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName);
+  HRESULT Initialize() {
+    return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
+  }
+
+  bool IsEnabled() const { return DxcompilerSupport.m_dll != nullptr; }
 };
+} // namespace dxc

include/dxc/Support/dxcapi.use.h

@@ -21,12 +21,14 @@ extern const char *kDxilLib;
 
 // Helper class to dynamically load the dxcompiler or a compatible libraries.
 class DxcDllSupport {
+  friend class DxcDllExtValidationSupport;
+
 protected:
   HMODULE m_dll;
   DxcCreateInstanceProc m_createFn;
   DxcCreateInstance2Proc m_createFn2;
 
-  virtual HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName) {
+  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName) {
     if (m_dll != nullptr)
       return S_OK;
 
@@ -85,7 +87,7 @@ class DxcDllSupport {
     other.m_createFn2 = nullptr;
   }
 
-  virtual ~DxcDllSupport() { Cleanup(); }
+  ~DxcDllSupport() { Cleanup(); }
 
   HRESULT Initialize() {
     return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
@@ -100,8 +102,7 @@ class DxcDllSupport {
     return CreateInstance(clsid, __uuidof(TInterface), (IUnknown **)pResult);
   }
 
-  virtual HRESULT CreateInstance(REFCLSID clsid, REFIID riid,
-                                 IUnknown **pResult) {
+  HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult) {
     if (pResult == nullptr)
       return E_POINTER;
     if (m_dll == nullptr)
@@ -117,8 +118,8 @@ class DxcDllSupport {
                            (IUnknown **)pResult);
   }
 
-  virtual HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
-                                  IUnknown **pResult) {
+  HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
+                          IUnknown **pResult) {
     if (pResult == nullptr)
       return E_POINTER;
     if (m_dll == nullptr)
@@ -142,7 +143,7 @@ class DxcDllSupport {
     return true;
   }
 
-  virtual void Cleanup() {
+  void Cleanup() {
     if (m_dll != nullptr) {
       m_createFn = nullptr;
       m_createFn2 = nullptr;
@@ -155,7 +156,7 @@ class DxcDllSupport {
     }
   }
 
-  virtual HMODULE Detach() {
+  HMODULE Detach() {
     HMODULE hModule = m_dll;
     m_dll = nullptr;
     return hModule;

lib/DxcSupport/dxcapi.extval.cpp

@@ -4,10 +4,29 @@
 // WinIncludes must come before dxcapi.extval.h
 #include "dxc/Support/dxcapi.extval.h"
 
+namespace dxc {
+
+HRESULT DxcDllExtValidationSupport::CreateInstance(REFCLSID clsid, REFIID riid,
+                                                   IUnknown **pResult) {
+  if (DxilExtValSupport.IsEnabled() && clsid == CLSID_DxcValidator)
+    return DxilExtValSupport.CreateInstance(clsid, riid, pResult);
+
+  return DxcompilerSupport.CreateInstance(clsid, riid, pResult);
+}
+
+HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
+                                                    REFCLSID clsid, REFIID riid,
+                                                    IUnknown **pResult) {
+  if (DxilExtValSupport.IsEnabled() && clsid == CLSID_DxcValidator)
+    return DxilExtValSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
+
+  return DxcompilerSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
+}
+
 HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR dllName,
                                                        LPCSTR fnName) {
   // Load dxcompiler.dll
-  HRESULT Result = DxcDllSupport::InitializeInternal(dllName, fnName);
+  HRESULT Result = DxcompilerSupport.InitializeInternal(dllName, fnName);
   // if dxcompiler.dll fails to load, return the failed HRESULT
   if (DXC_FAILED(Result)) {
     return Result;
@@ -31,24 +50,9 @@ HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR dllName,
   // to see if dxil.dll is successfully loaded.
   // the CheckDxilDLLLoaded function can determine whether there were any
   // problems loading dxil.dll or not
-  DxilSupport.InitializeForDll(DllPathStr.data(), fnName);
+  DxilExtValSupport.InitializeForDll(DllPathStr.data(), fnName);
 
   return S_OK;
 }
 
-HRESULT DxcDllExtValidationSupport::CreateInstance(REFCLSID clsid, REFIID riid,
-                                                   IUnknown **pResult) {
-  if (DxilSupport.IsEnabled() && clsid == CLSID_DxcValidator)
-    return DxilSupport.CreateInstance(clsid, riid, pResult);
-
-  return DxcDllSupport::CreateInstance(clsid, riid, pResult);
-}
-
-HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
-                                                    REFCLSID clsid, REFIID riid,
-                                                    IUnknown **pResult) {
-  if (DxilSupport.IsEnabled() && clsid == CLSID_DxcValidator)
-    return DxilSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
-
-  return DxcDllSupport::CreateInstance2(pMalloc, clsid, riid, pResult);
-}
+} // namespace dxc

tools/clang/unittests/HLSL/ValidationTest.cpp

@@ -4235,8 +4235,8 @@ void SetEnvVarW(const std::wstring &VarName, const std::wstring &VarValue) {
 // works as intended.
 
 TEST_F(ValidationTest, UnitTestExtValidationSupport) {
-  DxcDllExtValidationSupport ExtSupportEmpty;
-  DxcDllExtValidationSupport ExtSupportBogus;
+  dxc::DxcDllExtValidationSupport ExtSupportEmpty;
+  dxc::DxcDllExtValidationSupport ExtSupportBogus;
 
   // capture any existing value in the environment variable,
   // so that it can be restored after the test