Give shared modules in unittests the platform-native extension, make PipSqueak a MODULE

[thakis]

Summary

As far as I can tell from revision history, there's no good reason to call these files .so instead of .dll in Windows, so use the normal extension.

Also change PipSquak from SHARED to MODULE -- it's never passed to target_link_libraries() and only loaded via dlopen(), so MODULE is more appropriate. This makes it possible to delete a workaround for SHARED ldflags being not quite right as well.

No intended behavior change.

[philip.pfaffe]

Fundamentally looks good, but I'm slightly concerned about using different macros in the Code (LTDL_SHLIB_EXT) vs. in the build (LLVM_PLUGIN_EXT). Right now those are identical, but it might change. Can we export LLVM_PLUGIN_EXT in config.h?

[thakis]

How about I use LTDL_SHLIB_EXT instead of LLVM_PLUGIN_EXT in the cmake files? (I'm not sure why we have both, they're set to the same thing: http://llvm-cs.pcc.me.uk/cmake/modules/HandleLLVMOptions.cmake#132)

[philip.pfaffe]

Since this is only for the testcase, sounds perfect!

[thakis]

Aha, they used to be different before https://reviews.llvm.org/rL201316

In theory, I suppose LLVM_PLUGIN_EXT is more correct with that history, but in practice I suggest I use LTDL_SHLIB_EXT here and then replace LLVM_PLUGIN_EXT with LTDL_SHLIB_EXT everywhere else (not too many uses) in a follow-up since in the LLVM build shared libraries and loadable modules have the same extension.

[thakis]

LTDL_SHLIB_EXT

[philip.pfaffe]

Thanks!

[thakis]

r332487, thanks!

unittests/Passes/CMakeLists.txt

 
 set_output_directory(TestPlugin
   BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
   LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
   )
 
 set_target_properties(TestPlugin
   PROPERTIES PREFIX ""
-  SUFFIX ".so"
+  SUFFIX ${LTDL_SHLIB_EXT}
   )
 set_target_properties(TestPlugin PROPERTIES FOLDER "Tests")
 
 if (WIN32 OR CYGWIN OR LLVM_EXPORT_SYMBOLS_FOR_PLUGINS)
   llvm_map_components_to_libnames(LLVM_DEPS ${LLVM_LINK_COMPONENTS})
   target_link_libraries(TestPlugin ${LLVM_DEPS})
 endif()
 
 add_dependencies(TestPlugin intrinsics_gen)
 add_dependencies(PluginsTests TestPlugin)

unittests/Passes/PluginsTest.cpp

 //===- unittests/Passes/Plugins/PluginsTest.cpp ---------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/CGSCCPassManager.h"
+#include "llvm/Config/config.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Passes/PassPlugin.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Transforms/Scalar/LoopPassManager.h"
 #include "gtest/gtest.h"
 
 #include "TestPlugin.h"
 
 #include <cstdint>
 
 using namespace llvm;
 
 void anchor() {}
 
 static std::string LibPath(const std::string Name = "TestPlugin") {
   const std::vector<testing::internal::string> &Argvs =
       testing::internal::GetArgvs();
   const char *Argv0 = Argvs.size() > 0 ? Argvs[0].c_str() : "PluginsTests";
   void *Ptr = (void *)(intptr_t)anchor;
   std::string Path = sys::fs::getMainExecutable(Argv0, Ptr);
   llvm::SmallString<256> Buf{sys::path::parent_path(Path)};
-  sys::path::append(Buf, (Name + ".so").c_str());
+  sys::path::append(Buf, (Name + LTDL_SHLIB_EXT).c_str());
   return Buf.str();
 }
 
 TEST(PluginsTests, LoadPlugin) {
 #if !defined(LLVM_ENABLE_PLUGINS)
   // Disable the test if plugins are disabled.
   return;
 #endif

unittests/Support/DynamicLibrary/CMakeLists.txt

 # Needed by LLVM's CMake checks because this file defines multiple targets.
 set(LLVM_OPTIONAL_SOURCES ExportedFuncs.cpp PipSqueak.cpp)
 
 set(LLVM_LINK_COMPONENTS Support)
 
 add_library(DynamicLibraryLib STATIC ExportedFuncs.cpp)
 set_target_properties(DynamicLibraryLib PROPERTIES FOLDER "Tests")
 
 add_llvm_unittest(DynamicLibraryTests DynamicLibraryTest.cpp)
 target_link_libraries(DynamicLibraryTests PRIVATE DynamicLibraryLib)
 export_executable_symbols(DynamicLibraryTests)
 
 function(dynlib_add_module NAME)
-  add_library(${NAME} SHARED PipSqueak.cpp)
+  add_library(${NAME} MODULE PipSqueak.cpp)
   set_target_properties(${NAME} PROPERTIES FOLDER "Tests")
 
   set_output_directory(${NAME}
     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
     LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
     )
 
   set_target_properties(${NAME}
     PROPERTIES PREFIX ""
-    SUFFIX ".so"
+    SUFFIX ${LTDL_SHLIB_EXT}
     )
 
   add_dependencies(DynamicLibraryTests ${NAME})
 endfunction(dynlib_add_module)
 
-# Revert -Wl,-z,nodelete on this test since it relies on the file
-# being unloaded.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  string(REPLACE "-Wl,-z,nodelete" "" CMAKE_SHARED_LINKER_FLAGS
-    ${CMAKE_SHARED_LINKER_FLAGS})
-endif()
-
 dynlib_add_module(PipSqueak)
 dynlib_add_module(SecondLib)

unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp

 #include "gtest/gtest.h"
 
 #include "PipSqueak.h"
 
 using namespace llvm;
 using namespace llvm::sys;
 
 std::string LibPath(const std::string Name = "PipSqueak") {
-  const std::vector<testing::internal::string>& Argvs = testing::internal::GetArgvs();
-  const char *Argv0 = Argvs.size() > 0 ? Argvs[0].c_str() : "DynamicLibraryTests";
+  const std::vector<testing::internal::string> &Argvs =
+      testing::internal::GetArgvs();
+  const char *Argv0 =
+      Argvs.size() > 0 ? Argvs[0].c_str() : "DynamicLibraryTests";
   void *Ptr = (void*)(intptr_t)TestA;
   std::string Path = fs::getMainExecutable(Argv0, Ptr);
   llvm::SmallString<256> Buf(path::parent_path(Path));
-  path::append(Buf, (Name+".so").c_str());
+  path::append(Buf, (Name + LTDL_SHLIB_EXT).c_str());
   return Buf.str();
 }
 
 #if defined(_WIN32) || (defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN))
 
 typedef void (*SetStrings)(std::string &GStr, std::string &LStr);
 typedef void (*TestOrder)(std::vector<std::string> &V);
 typedef const char *(*GetString)();