Create new class to handle external validation, and rename existing dll loading class.

include/dxc/Support/HLSLOptions.h

@@ -306,7 +306,7 @@ int ReadDxcOpts(const llvm::opt::OptTable *optionTable, unsigned flagsToInclude,
                 llvm::raw_ostream &errors);
 
 /// Sets up the specified DllLoader instance as per the given options.
-int SetupDllLoader(const DxcOpts &opts, dxc::DllLoader &dxcSupport,
+int SetupDllLoader(const DxcOpts &opts, dxc::SpecificDllLoader &dxcSupport,
                    llvm::raw_ostream &errors);
 
 void CopyArgsToWStrings(const llvm::opt::InputArgList &inArgs,

include/dxc/Support/dxcapi.extval.h

@@ -30,24 +30,19 @@ class DxcDllExtValidationLoader : public DllLoader {
   to satisfy the IDllLoader interface. The parameter is ignored
   because the relevant dlls are specific and known: dxcompiler.dll
   and dxil.dll. This class is not designed to handle any other dlls */
-  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) override {
+  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) {
     return InitializeInternal(entryPoint);
   }
 
-  bool HasCreateWithMalloc() const override {
+  bool HasCreateWithMalloc() const {
     assert(DxCompilerSupport.HasCreateWithMalloc() &&
            DxilExtValSupport.HasCreateWithMalloc());
     return true;
   }
 
   bool IsEnabled() const override { return DxCompilerSupport.IsEnabled(); }
 
-  void Cleanup() {
-    DxilExtValSupport.Cleanup();
-    DxCompilerSupport.Cleanup();
-  }
-
-  HMODULE Detach() override {
+  HMODULE Detach() {
     // Can't Detach and return a handle for DxilSupport. Cleanup() instead.
     DxilExtValSupport.Cleanup();
     return DxCompilerSupport.Detach();

include/dxc/Support/dxcapi.use.h

@@ -21,19 +21,19 @@ extern const char *kDxilLib;
 
 // Interface for common dll operations
 class DllLoader {
-public:
-  virtual HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) = 0;
-  DllLoader() = default;
-  DllLoader(const DllLoader &) = delete;
-  DllLoader(DllLoader &&) = delete;
 
 protected:
   virtual HRESULT CreateInstanceImpl(REFCLSID clsid, REFIID riid,
                                      IUnknown **pResult) = 0;
   virtual HRESULT CreateInstance2Impl(IMalloc *pMalloc, REFCLSID clsid,
                                       REFIID riid, IUnknown **pResult) = 0;
+  virtual ~DllLoader() {}
 
 public:
+  DllLoader() = default;
+  DllLoader(const DllLoader &) = delete;
+  DllLoader(DllLoader &&) = delete;
+
   template <typename TInterface>
   HRESULT CreateInstance(REFCLSID clsid, TInterface **pResult) {
     return CreateInstanceImpl(clsid, __uuidof(TInterface),
@@ -54,11 +54,7 @@ class DllLoader {
     return CreateInstance2Impl(pMalloc, clsid, riid, (IUnknown **)pResult);
   }
 
-  virtual bool HasCreateWithMalloc() const = 0;
-
   virtual bool IsEnabled() const = 0;
-
-  virtual HMODULE Detach() = 0;
 };
 
 // Helper class to dynamically load the dxcompiler or a compatible libraries.
@@ -128,13 +124,13 @@ class SpecificDllLoader : public DllLoader {
     other.m_createFn2 = nullptr;
   }
 
-  virtual ~SpecificDllLoader() { Cleanup(); }
+  ~SpecificDllLoader() override { Cleanup(); }
 
   HRESULT Initialize() {
     return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
   }
 
-  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) override {
+  HRESULT OverrideDll(LPCSTR dll, LPCSTR entryPoint) {
     return InitializeInternal(dll, entryPoint);
   }
 
@@ -166,7 +162,7 @@ class SpecificDllLoader : public DllLoader {
     return hr;
   }
 
-  bool HasCreateWithMalloc() const override { return m_createFn2 != nullptr; }
+  bool HasCreateWithMalloc() const { return m_createFn2 != nullptr; }
 
   bool IsEnabled() const override { return m_dll != nullptr; }
 
@@ -192,7 +188,7 @@ class SpecificDllLoader : public DllLoader {
     }
   }
 
-  HMODULE Detach() override {
+  HMODULE Detach() {
     HMODULE hModule = m_dll;
     m_dll = nullptr;
     return hModule;
@@ -209,7 +205,7 @@ inline DxcDefine GetDefine(LPCWSTR name, LPCWSTR value) {
 // Checks an HRESULT and formats an error message with the appended data.
 void IFT_Data(HRESULT hr, LPCWSTR data);
 
-void EnsureEnabled(DllLoader &dxcSupport);
+void EnsureEnabled(SpecificDllLoader &dxcSupport);
 void ReadFileIntoBlob(DllLoader &dxcSupport, LPCWSTR pFileName,
                       IDxcBlobEncoding **ppBlobEncoding);
 void WriteBlobToConsole(IDxcBlob *pBlob, DWORD streamType = STD_OUTPUT_HANDLE);

include/dxc/Test/DxcTestUtils.h

@@ -197,7 +197,8 @@ bool CheckNotMsgs(const LPCSTR pText, size_t TextCount,
                   const LPCSTR *pErrorMsgs, size_t errorMsgCount, bool bRegex);
 void GetDxilPart(dxc::DllLoader &dllSupport, IDxcBlob *pProgram,
                  IDxcBlob **pDxilPart);
-std::string DisassembleProgram(dxc::DllLoader &dllSupport, IDxcBlob *pProgram);
+std::string DisassembleProgram(dxc::SpecificDllLoader &dllSupport,
+                               IDxcBlob *pProgram);
 void SplitPassList(LPWSTR pPassesBuffer, std::vector<LPCWSTR> &passes);
 void MultiByteStringToBlob(dxc::DllLoader &dllSupport, const std::string &val,
                            UINT32 codePoint, IDxcBlob **ppBlob);

lib/DxcSupport/HLSLOptions.cpp

@@ -1384,7 +1384,7 @@ int ReadDxcOpts(const OptTable *optionTable, unsigned flagsToInclude,
 }
 
 /// Sets up the specified DllLoader instance as per the given options.
-int SetupDllLoader(const DxcOpts &opts, dxc::DllLoader &dxcSupport,
+int SetupDllLoader(const DxcOpts &opts, dxc::SpecificDllLoader &dxcSupport,
                    llvm::raw_ostream &errors) {
   if (!opts.ExternalLib.empty()) {
     DXASSERT(!opts.ExternalFn.empty(), "else ReadDxcOpts should have failed");

lib/DxcSupport/dxcapi.use.cpp

@@ -73,7 +73,7 @@ void IFT_Data(HRESULT hr, LPCWSTR data) {
   throw ::hlsl::Exception(hr, errMsg);
 }
 
-void EnsureEnabled(DllLoader &dxcSupport) {
+void EnsureEnabled(SpecificDllLoader &dxcSupport) {
   if (!dxcSupport.IsEnabled()) {
     IFT(dxcSupport.OverrideDll(kDxCompilerLib, "DxcCreateInstance"));
   }

tools/clang/unittests/HLSLExec/HlslExecTestUtils.h

@@ -228,7 +228,7 @@ static bool createDevice(ID3D12Device **D3DDevice,
 }
 
 inline void readHlslDataIntoNewStream(LPCWSTR RelativePath, IStream **Stream,
-                                      dxc::DllLoader &Support) {
+                                      dxc::SpecificDllLoader &Support) {
   VERIFY_SUCCEEDED(
       Support.OverrideDll(dxc::kDxCompilerLib, "DxcCreateInstance"));
   CComPtr<IDxcLibrary> Library;

tools/clang/unittests/HLSLTestLib/DxcTestUtils.cpp

@@ -181,7 +181,8 @@ bool CheckOperationResultMsgs(IDxcOperationResult *pResult,
       maySucceedAnyway, bRegex);
 }
 
-std::string DisassembleProgram(dxc::DllLoader &dllSupport, IDxcBlob *pProgram) {
+std::string DisassembleProgram(dxc::SpecificDllLoader &dllSupport,
+                               IDxcBlob *pProgram) {
   CComPtr<IDxcCompiler> pCompiler;
   CComPtr<IDxcBlobEncoding> pDisassembly;