Various windows fixes

.github/workflows/ci.yml

@@ -666,15 +666,15 @@ jobs:
                 -DUSE_REPL=OFF                                  `
                 -DCling_DIR="$env:LLVM_BUILD_DIR\tools\cling"   `
                 -DLLVM_DIR="$env:LLVM_BUILD_DIR" `
-                -DClang_DIR="$env:LLVM_BUILD_DIR"  -DBUILD_SHARED_LIBS=ON -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR"  ..\
+                -DClang_DIR="$env:LLVM_BUILD_DIR"  -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR"  ..\
         }
         else
         {
           cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }}    `
                 -DUSE_CLING=OFF                             `
                 -DUSE_REPL=ON                               `
                 -DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm"  `
-                -DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang"  -DBUILD_SHARED_LIBS=ON    -DCODE_COVERAGE=${{ env.CODE_COVERAGE }}  -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR"  ..\
+                -DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang"  -DCODE_COVERAGE=${{ env.CODE_COVERAGE }}  -DCMAKE_INSTALL_PREFIX="$env:CPPINTEROP_DIR"  ..\
         }
         cmake --build . --target check-cppinterop --parallel ${{ env.ncpus }}
         cd ..

README.md

@@ -79,7 +79,7 @@ cd llvm-project
 ```
 Get the following patches required for development work. To apply these patches on Linux and MacOS execute the following command
 ```
-git apply -v ..\patches\llvm\clang${{ matrix.clang-runtime }}-*.patch
+git apply -v .../patches/llvm/clang17-*.patch
 ```
 and
 ```

cmake/modules/GoogleTest.cmake

@@ -14,7 +14,7 @@ if(MSVC)
     -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${_gtest_byproduct_binary_dir}/lib/
     -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO:PATH=${_gtest_byproduct_binary_dir}/lib/
     -Dgtest_force_shared_crt=ON
-    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release)
+    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG>)
 elseif(APPLE)
   set(EXTRA_GTEST_OPTS -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT})
 endif()
@@ -32,7 +32,7 @@ ExternalProject_Add(
   #            -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=ReleaseLibs
   #            -Dgtest_force_shared_crt=ON
   CMAKE_ARGS -G ${CMAKE_GENERATOR}
-                -DCMAKE_BUILD_TYPE=Release
+                -DCMAKE_BUILD_TYPE=$<CONFIG>
                 -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
                 -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -59,7 +59,11 @@ file(MAKE_DIRECTORY ${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR})
 
 # Libraries
 ExternalProject_Get_Property(googletest binary_dir)
-set(_G_LIBRARY_PATH ${binary_dir}/lib/)
+if(WIN32)
+  set(_G_LIBRARY_PATH  ${_gtest_byproduct_binary_dir}/lib)
+else()
+  set(_G_LIBRARY_PATH ${binary_dir}/lib/)
+endif()
 
 # Use gmock_main instead of gtest_main because it initializes gtest as well.
 # Note: The libraries are listed in reverse order of their dependancies.

include/clang/Interpreter/CppInterOp.h

@@ -462,7 +462,7 @@ namespace Cpp {
 
   /// Looks up the library if access is enabled.
   ///\returns the path to the library.
-  const std::string LookupLibrary(const char *lib_name);
+  std::string LookupLibrary(const char* lib_name);
 
   /// Finds \c lib_stem considering the list of search paths and loads it by
   /// calling dlopen.

lib/Interpreter/CMakeLists.txt

@@ -34,9 +34,12 @@ set(link_libs
   clangFrontend
   clangLex
   clangSema
-  dl
   )
 
+ if(NOT WIN32)
+  list(APPEND link_libs dl)
+ endif()
+
 # Get rid of libLLVM-X.so which is appended to the list of static libraries.
 if (LLVM_LINK_LLVM_DYLIB)
   set(new_libs ${link_libs})

lib/Interpreter/Compatibility.h

@@ -16,6 +16,7 @@
 #include "llvm/Config/llvm-config.h"
 #include "llvm/ExecutionEngine/JITSymbol.h"
 #include "llvm/ExecutionEngine/Orc/LLJIT.h"
+#include "llvm/Support/Casting.h"
 #include "llvm/Support/Path.h"
 
 #ifdef USE_CLING
@@ -169,8 +170,8 @@ inline void maybeMangleDeclName(const clang::GlobalDecl& GD,
 
 #if defined(_WIN32)
   // MicrosoftMangle.cpp:954 calls llvm_unreachable when mangling Dtor_Comdat
-  if (isa<clang::CXXDestructorDecl>(GD.getDecl()) &&
-      GD.getDtorType() == Dtor_Comdat) {
+  if (llvm::isa<clang::CXXDestructorDecl>(GD.getDecl()) &&
+      GD.getDtorType() == clang::Dtor_Comdat) {
     if (const clang::IdentifierInfo* II = D->getIdentifier())
       RawStr << II->getName();
   } else

lib/Interpreter/CppInterOp.cpp

@@ -30,14 +30,17 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_os_ostream.h"
 
-#include <dlfcn.h>
 #include <sstream>
 #include <string>
 
 // Stream redirect.
 #ifdef WIN32
 #include <io.h>
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
 #else
+#include <dlfcn.h>
 #include <unistd.h>
 #endif // WIN32
 
@@ -1084,7 +1087,8 @@ namespace Cpp {
       auto GD = GlobalDecl(VD);
       std::string mangledName;
       compat::maybeMangleDeclName(GD, mangledName);
-      auto address = dlsym(/*whole_process=*/0, mangledName.c_str());
+      void* address = llvm::sys::DynamicLibrary::SearchForAddressOfSymbol(
+          mangledName.c_str());
       auto &I = getInterp();
       if (!address)
         address = I.getAddressOfGlobal(GD);
@@ -2584,7 +2588,7 @@ namespace Cpp {
     return compat::convertTo<intptr_t>(V);
   }
 
-  const std::string LookupLibrary(const char *lib_name) {
+  std::string LookupLibrary(const char* lib_name) {
     return getInterp().getDynamicLibraryManager()->lookupLibrary(lib_name);
   }
 

lib/Interpreter/DynamicLibraryManager.cpp

@@ -17,6 +17,11 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 
+#if defined(_WIN32)
+#include "llvm/BinaryFormat/COFF.h"
+#include "llvm/Support/Endian.h"
+#endif
+
 #include <fstream>
 #include <system_error>
 #include <sys/stat.h>
@@ -429,6 +434,21 @@ namespace Cpp {
     }
   }
 
+#if defined(_WIN32)
+  static bool IsDLL(llvm::StringRef headers) {
+    using namespace llvm::support::endian;
+
+    uint32_t headeroffset = read32le(headers.data() + 0x3c);
+    auto peheader = headers.substr(headeroffset, 24);
+    if (peheader.size() != 24) {
+      return false;
+    }
+    // Read Characteristics from the coff header
+    uint32_t characteristics = read16le(peheader.data() + 22);
+    return (characteristics & llvm::COFF::IMAGE_FILE_DLL) != 0;
+  }
+#endif
+
   bool DynamicLibraryManager::isSharedLibrary(StringRef libFullPath,
                                               bool* exists /*=0*/) {
     using namespace llvm;
@@ -449,7 +469,8 @@ namespace Cpp {
     // do its work.
     // TODO: Fix the code upstream and consider going back to calling the
     // convenience function after a future LLVM upgrade.
-    std::ifstream in(libFullPath.str(), std::ios::binary);
+    std::string path = libFullPath.str();
+    std::ifstream in(path, std::ios::binary);
     char header[1024] = {0};
     in.read(header, sizeof(header));
     if (in.fail()) {
@@ -474,10 +495,9 @@ namespace Cpp {
       (Magic == file_magic::elf_shared_object)
 #endif
 #elif defined(_WIN32)
-      // We should only include dll libraries without including executables,
-      // object code and others...
-      (Magic == file_magic::pecoff_executable &&
-       platform::IsDLL(libFullPath.str()))
+        // We should only include dll libraries without including executables,
+        // object code and others...
+        (Magic == file_magic::pecoff_executable && IsDLL(headerStr))
 #else
 # error "Unsupported platform."
 #endif

lib/Interpreter/DynamicLibraryManager.h

@@ -52,7 +52,7 @@ class DynamicLibraryManager {
   using SearchPathInfos = llvm::SmallVector<SearchPathInfo, 32>;
 
 private:
-  typedef const void* DyLibHandle;
+  typedef void* DyLibHandle;
   typedef llvm::DenseMap<DyLibHandle, std::string> DyLibs;
   ///\brief DynamicLibraries loaded by this Interpreter.
   ///

lib/Interpreter/DynamicLibraryManagerSymbol.cpp

@@ -52,6 +52,8 @@
 #endif // __APPLE__
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #include <libloaderapi.h> // For GetModuleFileNameA
 #include <memoryapi.h> // For VirtualQuery