[compiler-rt] [sanitizers] [windows] Use a linker directive pragma for psapi

[mstorsjo]

Summary

This allows users of static libraries (such as ubsan) to link without knowing about this transitive dependency, if using the psapi functions that require linking to a separate psapi library. Since Windows 7, these functions (EnumProcessModules, GetModuleInformation, GetProcessMemoryInfo) are remapped to K32- prefixed ones, available in kernel32.dll.

[mstorsjo]

lib/sanitizer_common/sanitizer_win.cc

34 ↗

(On Diff #168753)

This distinction between library names (psapi.lib vs libpsapi.a) needs to be taken care of at some level; either here, in clang or in lld. I'm including it in all patches, to easier compare where the logic fits the best.

For MinGW, this pragma/directive requires compiling with -fms-extensions, and ld.bfd doesn't support defaultlib in embedded directives (but the sanitizers in general require a number of other features missing in ld.bfd already).

[rnk]

lib/sanitizer_common/sanitizer_win.cc

34 ↗

(On Diff #168753)

If this is only targeting LLD, then I'd prefer to just use the basename "psapi" version and continue forward with making LLD search for .a files in addition to .lib files.

[mstorsjo]

Assuming mingw library name logic elsewhere.

[rnk]

lgtm

compiler-rt/trunk/lib/asan/CMakeLists.txt

 set(ASAN_DYNAMIC_LIBS ${SANITIZER_CXX_ABI_LIBRARY} ${SANITIZER_COMMON_LINK_LIBS})
 
 append_list_if(COMPILER_RT_HAS_LIBDL dl ASAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBRT rt ASAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBM m ASAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread ASAN_DYNAMIC_LIBS)
 append_list_if(COMPILER_RT_HAS_LIBLOG log ASAN_DYNAMIC_LIBS)
 append_list_if(MINGW "${MINGW_LIBRARIES}" ASAN_DYNAMIC_LIBS)
-append_list_if(MINGW psapi ASAN_DYNAMIC_LIBS)
 
 # Compile ASan sources into an object library.
 
 add_compiler_rt_object_libraries(RTAsan_dynamic
   OS ${SANITIZER_COMMON_SUPPORTED_OS}
   ARCHS ${ASAN_SUPPORTED_ARCH}
   SOURCES ${ASAN_SOURCES} ${ASAN_CXX_SOURCES}
   ADDITIONAL_HEADERS ${ASAN_HEADERS}

compiler-rt/trunk/lib/sanitizer_common/sanitizer_win.cc

 
 #include "sanitizer_common.h"
 #include "sanitizer_file.h"
 #include "sanitizer_libc.h"
 #include "sanitizer_mutex.h"
 #include "sanitizer_placement_new.h"
 #include "sanitizer_win_defs.h"
 
+#if defined(PSAPI_VERSION) && PSAPI_VERSION == 1
+#pragma comment(lib, "psapi")
+#endif
+
 // A macro to tell the compiler that this part of the code cannot be reached,
 // if the compiler supports this feature. Since we're using this in
 // code that is called when terminating the process, the expansion of the
 // macro should not terminate the process to avoid infinite recursion.
 #if defined(__clang__)
 # define BUILTIN_UNREACHABLE() __builtin_unreachable()
 #elif defined(__GNUC__) && \
     (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))