Fix some issues raised in PR review

Author: mcbarton

CMakeLists.txt

@@ -428,8 +428,8 @@ if(MSVC)
    ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@D@Z
    ??$?6U?$char_traits@D@std@@@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@0@AEAV10@PEBD@Z
    ?_Facet_Register@std@@YAXPEAV_Facet_base@1@@Z
-  ) 
-  
+  )
+
   if(MSVC_VERSION LESS 1914)
     set(MSVC_EXPORTLIST ${MSVC_EXPORTLIST} ??3@YAXPAX0@Z ??_V@YAXPAX0@Z)
   endif()

lib/Interpreter/CppInterOp.cpp

@@ -2629,7 +2629,6 @@ namespace Cpp {
 #ifdef _WIN32
     // FIXME : Workaround Sema::PushDeclContext assert on windows
     ClingArgv.push_back("-fno-delayed-template-parsing");
-    ClingArgv.push_back("-femulated-tls");
 #endif
     ClingArgv.insert(ClingArgv.end(), Args.begin(), Args.end());
     // To keep the Interpreter creation interface between cling and clang-repl
@@ -3278,7 +3277,7 @@ namespace Cpp {
     int m_DupFD = -1;
 
   public:
-#if defined(_WIN32)
+#ifdef _WIN32
     StreamCaptureInfo(int FD)
         : m_TempFile(
               []() {

unittests/CppInterOp/CUDATest.cpp

@@ -46,7 +46,7 @@ TEST(DISABLED_CUDATest, Sanity) {
 #else
 TEST(CUDATest, Sanity) {
 #endif // CLANG_VERSION_MAJOR < 16
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   if (!HasCudaSDK())
@@ -55,7 +55,7 @@ TEST(CUDATest, Sanity) {
 }
 
 TEST(CUDATest, CUDAH) {
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   if (!HasCudaSDK())
@@ -67,7 +67,7 @@ TEST(CUDATest, CUDAH) {
 }
 
 TEST(CUDATest, CUDARuntime) {
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   if (!HasCudaRuntime())

unittests/CppInterOp/FunctionReflectionTest.cpp

@@ -799,7 +799,7 @@ TEST(FunctionReflectionTest, IsStaticMethod) {
 TEST(FunctionReflectionTest, GetFunctionAddress) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   std::vector<Decl*> Decls, SubDecls;
@@ -1078,7 +1078,7 @@ TEST(FunctionReflectionTest, GetFunctionArgDefault) {
 TEST(FunctionReflectionTest, Construct) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
 
@@ -1119,7 +1119,7 @@ TEST(FunctionReflectionTest, Destruct) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
 
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
 

unittests/CppInterOp/InterpreterTest.cpp

@@ -45,7 +45,7 @@ TEST(InterpreterTest, DebugFlag) {
 }
 
 TEST(InterpreterTest, Evaluate) {
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   if (llvm::sys::RunningOnValgrind())
@@ -64,7 +64,7 @@ TEST(InterpreterTest, Evaluate) {
 }
 
 TEST(InterpreterTest, Process) {
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   if (llvm::sys::RunningOnValgrind())
@@ -105,7 +105,7 @@ TEST(InterpreterTest, DetectResourceDir) {
 #else
 TEST(InterpreterTest, DISABLED_DetectResourceDir) {
 #endif // LLVM_BINARY_DIR
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   Cpp::CreateInterpreter();
@@ -117,7 +117,7 @@ TEST(InterpreterTest, DISABLED_DetectResourceDir) {
 }
 
 TEST(InterpreterTest, DetectSystemCompilerIncludePaths) {
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   std::vector<std::string> includes;

unittests/CppInterOp/JitTest.cpp

@@ -14,7 +14,7 @@ static int printf_jit(const char* format, ...) {
 TEST(JitTest, InsertOrReplaceJitSymbol) {
   if (llvm::sys::RunningOnValgrind())
     GTEST_SKIP() << "XFAIL due to Valgrind report";
-#if defined(_WIN32)
+#ifdef _WIN32
   GTEST_SKIP() << "Disabled on Windows. Needs fixing.";
 #endif
   std::vector<Decl*> Decls;

unittests/CppInterOp/VariableReflectionTest.cpp

@@ -54,7 +54,7 @@ TEST(VariableReflectionTest, GetDatamembers) {
   EXPECT_EQ(datamembers.size(), 3);
   EXPECT_EQ(datamembers1.size(), 0);
 }
-#if defined(_WIN32)
+#ifdef _WIN32
 #pragma warning(disable : 4201)
 #endif
 #define CODE                                                                   \
@@ -133,7 +133,7 @@ TEST(VariableReflectionTest, DatamembersWithAnonymousStructOrUnion) {
             ((intptr_t) & (k3.c)) - ((intptr_t) & (k3.num)));
   EXPECT_EQ(Cpp::GetVariableOffset(datamembers_klass3[4]),
             ((intptr_t) & (k3.num2)) - ((intptr_t) & (k3.num)));
-#if defined(_WIN32)
+#ifdef _WIN32
 #pragma warning(default : 4201)
 #endif
 }