Use libc++ headers from the correct build tree for sanitizer tests

[eugenis]

Summary

This is needed for http://reviews.llvm.org/D11740. With that change, libc++ headers can no longer be included directly from libc++ source.

[samsonov]

LGTM

test/tsan/CMakeLists.txt

12

${COMPILER_RT_BINARY_DIR} here and below.

[EricWF]

I would hold off on committing this. I'm going to fight not being able to use the headers in the libc++ source directory.

[eugenis]

I agree, I just ran in some tricky issues with libcxx/libcxxabi interdependency. It's not easy to set up dependencies on the generated libc++ headers from libc++abi.

cmake/Modules/AddCompilerRT.cmake

ExternalProject_Add(${name}
     PREFIX ${prefix}
     SOURCE_DIR ${COMPILER_RT_LIBCXX_PATH}
     CMAKE_ARGS -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER}
                -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_COMPILER}
                -DCMAKE_C_FLAGS=${LIBCXX_CFLAGS}
                -DCMAKE_CXX_FLAGS=${LIBCXX_CFLAGS}
                -DCMAKE_BUILD_TYPE=Release
                -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+               -DLIBCXX_ABI_MAJOR_VERSION=${LIBCXX_ABI_MAJOR_VERSION}
+               -DLIBCXX_ABI_MINOR_VERSION=${LIBCXX_ABI_MINOR_VERSION}
     LOG_BUILD 1
     LOG_CONFIGURE 1
     LOG_INSTALL 1
     )
   set_target_properties(${name} PROPERTIES EXCLUDE_FROM_ALL TRUE)
 
   ExternalProject_Add_Step(${name} force-reconfigure
     DEPENDERS configure

lib/msan/tests/CMakeLists.txt

 # Main MemorySanitizer unit tests.
 add_custom_target(MsanUnitTests)
 set_target_properties(MsanUnitTests PROPERTIES FOLDER "MSan unit tests")
 
 # Adds MSan unit tests and benchmarks for architecture.
 macro(add_msan_tests_for_arch arch kind)
   # Build gtest instrumented with MSan.
   set(MSAN_INST_GTEST)
+  set(LIBCXX_CFLAGS "-I${LIBCXX_PREFIX}/include/c++/v${LIBCXX_ABI_MAJOR_VERSION}")
   msan_compile(MSAN_INST_GTEST ${COMPILER_RT_GTEST_SOURCE} ${arch} "${kind}"
-                               ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
+               ${LIBCXX_CFLAGS} ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
 
   # Instrumented tests.
   set(MSAN_INST_TEST_OBJECTS)
   foreach (SOURCE ${MSAN_UNITTEST_SOURCES})
     msan_compile(MSAN_INST_TEST_OBJECTS ${SOURCE} ${arch} "${kind}"
-                 ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
+                 ${LIBCXX_CFLAGS} ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
   endforeach(SOURCE)
 
   # Instrumented loadable module objects.
   set(MSAN_INST_LOADABLE_OBJECTS)
   msan_compile(MSAN_INST_LOADABLE_OBJECTS ${MSAN_LOADABLE_SOURCE} ${arch} "${kind}"
-               ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
+               ${LIBCXX_CFLAGS} ${MSAN_UNITTEST_INSTRUMENTED_CFLAGS} ${ARGN})
 
   # Instrumented loadable library tests.
   set(MSAN_LOADABLE_SO)
   msan_link_shared(MSAN_LOADABLE_SO "libmsan_loadable" ${arch} "${kind}"
                    OBJECTS ${MSAN_INST_LOADABLE_OBJECTS}
                    DEPS ${MSAN_INST_LOADABLE_OBJECTS})
 
   set(MSAN_TEST_OBJECTS ${MSAN_INST_TEST_OBJECTS} ${MSAN_INST_GTEST})

test/tsan/CMakeLists.txt

 set(TSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 if(NOT ${LLVM_NATIVE_ARCH} STREQUAL "Mips")
   list(APPEND TSAN_TEST_DEPS GotsanRuntimeCheck)
 endif()
 if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND TSAN_TEST_DEPS tsan)
 endif()
 if(COMPILER_RT_HAS_LIBCXX_SOURCES AND
    COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang")
   list(APPEND TSAN_TEST_DEPS libcxx_tsan)
   set(TSAN_HAS_LIBCXX True)
+  set(TSAN_LIBCXX_INCDIR ${CMAKE_CURRENT_BINARY_DIR}/../../lib/tsan/libcxx_tsan/include/c++/v${LIBCXX_ABI_MAJOR_VERSION})
+  set(TSAN_LIBCXX_LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/../../lib/tsan/libcxx_tsan/lib)
 else()
   set(TSAN_HAS_LIBCXX False)
 endif()
 
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
 

test/tsan/lit.cfg

 
 # Setup default compiler flags used with -fsanitize=thread option.
 clang_tsan_cflags = ["-fsanitize=thread",
                      "-Wall",
                      "-m64"] + config.debug_info_flags + extra_cflags
 clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags
 # Add additional flags if we're using instrumented libc++.
 if config.has_libcxx:
-  # FIXME: Dehardcode this path somehow.
-  libcxx_path = os.path.join(config.compiler_rt_obj_root, "lib",
-                             "tsan", "libcxx_tsan")
-  libcxx_incdir = os.path.join(libcxx_path, "include", "c++", "v1")
-  libcxx_libdir = os.path.join(libcxx_path, "lib")
-  libcxx_so = os.path.join(libcxx_libdir, "libc++.so")
+  libcxx_so = os.path.join(config.libcxx_libdir, "libc++.so")
   clang_tsan_cxxflags += ["-std=c++11",
-                          "-I%s" % libcxx_incdir,
+                          "-I%s" % config.libcxx_incdir,
                           libcxx_so,
-                          "-Wl,-rpath=%s" % libcxx_libdir]
+                          "-Wl,-rpath=%s" % config.libcxx_libdir]
 
 def build_invocation(compile_flags):
   return " " + " ".join([config.clang] + compile_flags) + " "
 
 config.substitutions.append( ("%clang_tsan ", build_invocation(clang_tsan_cflags)) )
 config.substitutions.append( ("%clangxx_tsan ", build_invocation(clang_tsan_cxxflags)) )
 
 # Define CHECK-%os to check for OS-dependent output.

test/tsan/lit.site.cfg.in

 ## Autogenerated by LLVM/Clang configuration.
 # Do not edit!
 
 config.has_libcxx = @TSAN_HAS_LIBCXX@
+config.libcxx_incdir = "@TSAN_LIBCXX_INCDIR@"
+config.libcxx_libdir = "@TSAN_LIBCXX_LIBDIR@"
 
 # Load common config for all compiler-rt lit tests.
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
 
 # Load tool-specific config that would do the real work.
 lit_config.load_config(config, "@CMAKE_CURRENT_SOURCE_DIR@/lit.cfg")