WArgV is needed only on non-Windows platforms (microsoft#5576)

Fixes internal build break.

Author: hekota

include/dxc/WinAdapter.h

@@ -1065,25 +1065,18 @@ class CComBSTR
 
 };
 
-
-#endif // __cplusplus
-
-#endif // _WIN32
-
-#ifdef __cplusplus
-
-#include <string>
-#include <vector>
 //===--------- Convert argv to wchar ----------------===//
 class WArgV {
   std::vector<std::wstring> WStringVector;
   std::vector<const wchar_t *> WCharPtrVector;
 
 public:
   WArgV(int argc, const char **argv);
-  WArgV(int argc, const wchar_t **argv);
   const wchar_t **argv() { return WCharPtrVector.data();}
 };
-#endif
+
+#endif // __cplusplus
+
+#endif // _WIN32
 
 #endif // LLVM_SUPPORT_WIN_ADAPTER_H

lib/DxcSupport/WinAdapter.cpp

@@ -97,8 +97,6 @@ bool CComBSTR::operator==(_In_ const CComBSTR &bstrSrc) const throw() {
   return wcscmp(m_str, bstrSrc.m_str) == 0;
 }
 
-#endif
-
 //===--------------------------- WArgV -------------------------------===//
 WArgV::WArgV(int argc, const char **argv)
     : WStringVector(argc), WCharPtrVector(argc) {
@@ -115,9 +113,4 @@ WArgV::WArgV(int argc, const char **argv)
   }
 }
 
-WArgV::WArgV(int argc, const wchar_t **argv)
-    : WCharPtrVector(argc) {
-  for (int i = 0; i < argc; ++i) {
-    WCharPtrVector[i] = argv[i];
-  }
-}
+#endif

tools/clang/tools/dxr/dxr.cpp

@@ -35,7 +35,10 @@ using namespace hlsl::options;
 #ifdef _WIN32
 int __cdecl wmain(int argc, const wchar_t **argv_) {
 #else
-int main(int argc, const char **argv_) {
+int main(int argc, const char **argv) {
+  // Convert argv to wchar.
+  WArgV ArgV(argc, argv);
+  const wchar_t **argv_ = ArgV.argv();
 #endif
   if (FAILED(DxcInitThreadMalloc())) return 1;
   DxcSetThreadMallocToDefault();
@@ -130,10 +133,8 @@ int main(int argc, const char **argv_) {
     IFT(pLibrary->CreateIncludeHandler(&pIncludeHandler));
     IFT(dxcSupport.CreateInstance(CLSID_DxcRewriter, &pRewriter));
 
-    // Convert argv to wchar.
-    WArgV ArgV(argc, argv_);
     IFT(pRewriter->RewriteWithOptions(pSource, wName.c_str(),
-                                      ArgV.argv(), argc, nullptr, 0,
+                                      argv_, argc, nullptr, 0,
                                       pIncludeHandler, &pRewriteResult));
 
     if (dxcOpts.OutputObject.empty()) {

unittests/DxcSupport/WinAdapterTest.cpp

@@ -23,16 +23,7 @@ TEST(WArgVTest, suppressAndTrap) {
   std::wstring data [] = {L"a", L"b"};
   const wchar_t *ref_argv[] = {data[0].c_str(), data[1].c_str()};
   {
-    WArgV ArgV(argc, ref_argv);
-    const wchar_t **wargv = ArgV.argv();
-    for (int i=0;i<argc;++i) {
-      EXPECT_EQ(0, std::wcscmp(ref_argv[i], wargv[i]));
-    }
-  }
-  {
-    int argc=2;
     const char *argv [] = {"a", "b"};
-
     WArgV ArgV(argc, argv);
     const wchar_t **wargv = ArgV.argv();
     for (int i=0;i<argc;++i) {