This reverts r317875.
llvm-svn: 317877
XRayArgs(const ToolChain &TC, const llvm::opt::ArgList &Args);
void addArgs(const ToolChain &TC, const llvm::opt::ArgList &Args,
llvm::opt::ArgStringList &CmdArgs, types::ID InputType) const;
- bool needsXRayRt() const { return XRayInstrument; }
};
} // namespace driver
#include "clang/Driver/DriverDiagnostic.h"
#include "clang/Driver/Options.h"
#include "clang/Driver/SanitizerArgs.h"
-#include "clang/Driver/XRayArgs.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Option/ArgList.h"
#include "llvm/Support/Path.h"
if (Sanitize.needsEsanRt())
AddLinkSanitizerLibArgs(Args, CmdArgs, "esan");
- const XRayArgs& XRay = getXRayArgs();
- if (XRay.needsXRayRt() && isTargetMacOS()) {
- AddLinkRuntimeLib(Args, CmdArgs, "libclang_rt.xray_osx.a", RLO_AlwaysLink);
- }
-
// Otherwise link libSystem, then the dynamic runtime library, and finally any
// target specific static runtime library.
CmdArgs.push_back("-lSystem");
D.Diag(diag::err_drv_clang_unsupported)
<< (std::string(XRayInstrumentOption) + " on " + Triple.str());
}
- else if (Triple.getOS() == llvm::Triple::Darwin)
- // Experimental support for macos.
- switch (Triple.getArch()) {
- case llvm::Triple::x86_64:
- break;
- default:
- D.Diag(diag::err_drv_clang_unsupported)
- << (std::string(XRayInstrumentOption) + " on " + Triple.str());
- }
else
D.Diag(diag::err_drv_clang_unsupported)
<< (std::string(XRayInstrumentOption) + " on non-Linux target OS");
set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${MIPS64})
set(ALL_ESAN_SUPPORTED_ARCH ${X86_64} ${MIPS64})
set(ALL_SCUDO_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${MIPS32} ${MIPS64})
-if(APPLE)
-set(ALL_XRAY_SUPPORTED_ARCH ${X86_64})
-else()
set(ALL_XRAY_SUPPORTED_ARCH ${X86_64} ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} powerpc64le)
-endif()
if(APPLE)
include(CompilerRTDarwinUtils)
set(SANITIZER_COMMON_SUPPORTED_OS osx)
set(PROFILE_SUPPORTED_OS osx)
set(TSAN_SUPPORTED_OS osx)
- set(XRAY_SUPPORTED_OS osx)
if(NOT SANITIZER_MIN_OSX_VERSION)
string(REGEX MATCH "-mmacosx-version-min=([.0-9]+)"
MACOSX_VERSION_MIN_FLAG "${CMAKE_CXX_FLAGS}")
list_intersect(SCUDO_SUPPORTED_ARCH
ALL_SCUDO_SUPPORTED_ARCH
SANITIZER_COMMON_SUPPORTED_ARCH)
- list_intersect(FUZZER_SUPPORTED_ARCH
- ALL_FUZZER_SUPPORTED_ARCH
- ALL_SANITIZER_COMMON_SUPPORTED_ARCH)
list_intersect(XRAY_SUPPORTED_ARCH
ALL_XRAY_SUPPORTED_ARCH
SANITIZER_COMMON_SUPPORTED_ARCH)
+ list_intersect(FUZZER_SUPPORTED_ARCH
+ ALL_FUZZER_SUPPORTED_ARCH
+ ALL_SANITIZER_COMMON_SUPPORTED_ARCH)
else()
# Architectures supported by compiler-rt libraries.
endif()
if (COMPILER_RT_HAS_SANITIZER_COMMON AND XRAY_SUPPORTED_ARCH AND
- OS_NAME MATCHES "Darwin|Linux")
+ OS_NAME MATCHES "Linux")
set(COMPILER_RT_HAS_XRAY TRUE)
else()
set(COMPILER_RT_HAS_XRAY FALSE)
append_list_if(
COMPILER_RT_BUILD_XRAY_NO_PREINIT XRAY_NO_PREINIT XRAY_COMMON_DEFINITIONS)
+add_compiler_rt_object_libraries(RTXray
+ ARCHS ${XRAY_SUPPORTED_ARCH}
+ SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS}
+ DEFS ${XRAY_COMMON_DEFINITIONS})
+
add_compiler_rt_component(xray)
set(XRAY_COMMON_RUNTIME_OBJECT_LIBS
- RTXray
RTSanitizerCommon
RTSanitizerCommonLibc)
-if (APPLE)
- set(XRAY_LINK_LIBS ${SANITIZER_COMMON_LINK_LIBS})
- set(XRAY_ASM_SOURCES xray_trampoline_x86_64.S)
-
- if (${CMAKE_GENERATOR} STREQUAL "Xcode")
- enable_language(ASM)
- else()
- set_source_files_properties(${XRAY_ASM_SOURCES} PROPERTIES LANGUAGE C)
- endif()
-
- add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINK_FLAGS)
- add_weak_symbols("xray" WEAK_SYMBOL_LINK_FLAGS)
-
- add_compiler_rt_object_libraries(RTXray
- OS ${XRAY_SUPPORTED_OS}
- ARCHS ${XRAY_SUPPORTED_ARCH}
- SOURCES ${x86_64_SOURCES}
- CFLAGS ${XRAY_CFLAGS}
- DEFS ${XRAY_COMMON_DEFINITIONS})
-
- # We only support running on osx for now.
- add_compiler_rt_runtime(clang_rt.xray
- STATIC
- OS ${XRAY_SUPPORTED_OS}
- ARCHS ${XRAY_SUPPORTED_ARCH}
- OBJECT_LIBS RTXray
- RTSanitizerCommon
- RTSanitizerCommonLibc
- CFLAGS ${XRAY_CFLAGS}
- DEFS ${XRAY_COMMON_DEFINITIONS}
- LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS} ${WEAK_SYMBOL_LINK_FLAGS}
- LINK_LIBS ${XRAY_LINK_LIBS}
- PARENT_TARGET xray)
-else()
foreach(arch ${XRAY_SUPPORTED_ARCH})
if(CAN_TARGET_${arch})
- add_compiler_rt_object_libraries(RTXray
- ARCHS ${XRAY_SUPPORTED_ARCH}
- SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS}
- DEFS ${XRAY_COMMON_DEFINITIONS})
add_compiler_rt_runtime(clang_rt.xray
STATIC
ARCHS ${arch}
PARENT_TARGET xray)
endif()
endforeach()
-endif()
if(COMPILER_RT_INCLUDE_TESTS)
add_subdirectory(tests)
-I${COMPILER_RT_SOURCE_DIR}/lib)
set(XRAY_TEST_ARCH ${XRAY_SUPPORTED_ARCH})
-set(XRAY_LINK_FLAGS)
-append_list_if(COMPILER_RT_HAS_LIBRT -lrt XRAY_LINK_FLAGS)
-append_list_if(COMPILER_RT_HAS_LIBM -lm XRAY_LINK_FLAGS)
-append_list_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread XRAY_LINK_FLAGS)
-
-if (APPLE)
- list(APPEND XRAY_LINK_FLAGS -lc++)
- list(APPEND XRAY_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS})
- set(XRAY_TEST_RUNTIME_OBJECTS
- $<TARGET_OBJECTS:RTSanitizerCommon.osx>
- $<TARGET_OBJECTS:RTSanitizerCommonLibc.osx>
- $<TARGET_OBJECTS:RTXray.osx>)
- set(XRAY_TEST_RUNTIME RTXRayTest)
- add_library(${XRAY_TEST_RUNTIME} STATIC ${XRAY_TEST_RUNTIME_OBJECTS})
- set_target_properties(${XRAY_TEST_RUNTIME} PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
- FOLDER "Compiler-RT Runtime tests")
-
- darwin_filter_host_archs(XRAY_SUPPORTED_ARCH XRAY_TEST_ARCH)
- list(APPEND XRAY_UNITTEST_CFLAGS ${DARWIN_osx_CFLAGS})
- list(APPEND XRAY_LINK_FLAGS "-lc++")
- list(APPEND XRAY_LINK_FLAGS "-fxray-instrument")
- add_weak_symbols("sanitizer_common" XRAY_LINK_FLAGS)
- add_weak_symbols("xray" XRAY_LINK_FLAGS)
-else()
- append_list_if(COMPILER_RT_HAS_LIBSTDCXX lstdc++ XRAY_LINK_FLAGS)
-endif()
-
macro(add_xray_unittest testname)
cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN})
- if(UNIX)
+ if(UNIX AND NOT APPLE)
foreach(arch ${XRAY_TEST_ARCH})
set(TEST_OBJECTS)
generate_compiler_rt_tests(TEST_OBJECTS
XRayUnitTests "${testname}-${arch}-Test" "${arch}"
SOURCES ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE}
- RUNTIME ${XRAY_TEST_RUNTIME}
- COMPILE_DEPS ${TEST_HEADERS}
DEPS gtest xray llvm-xray
CFLAGS ${XRAY_UNITTEST_CFLAGS}
LINK_FLAGS -fxray-instrument
${TARGET_LINK_FLAGS}
- ${CMAKE_THREAD_LIBS_INIT}
- ${XRAY_LINK_FLAGS})
+ -lstdc++ -lm ${CMAKE_THREAD_LIBS_INIT}
+ -lpthread
+ -ldl -lrt)
set_target_properties(XRayUnitTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
endforeach()
endif()
+++ /dev/null
-___start_xray_fn_idx
-___start_xray_instr_map
-___stop_xray_fn_idx
-___stop_xray_instr_map
#endif
}
-// Only add the preinit array initialization if the sanitizers can.
-#if !defined(XRAY_NO_PREINIT) && SANITIZER_CAN_USE_PREINIT_ARRAY
+#ifndef XRAY_NO_PREINIT
__attribute__((section(".preinit_array"),
used)) void (*__local_xray_preinit)(void) = __xray_init;
#endif
//===----------------------------------------------------------------------===//
#include "../builtins/assembly.h"
-#include "../sanitizer_common/sanitizer_asm.h"
-
-
.macro SAVE_REGISTERS
subq $192, %rsp
- CFI_DEF_CFA_OFFSET(200)
+ .cfi_def_cfa_offset 200
// At this point, the stack pointer should be aligned to an 8-byte boundary,
// because any call instructions that come after this will add another 8
// bytes and therefore align it to 16-bytes.
movq 8(%rsp), %r8
movq 0(%rsp), %r9
addq $192, %rsp
- CFI_DEF_CFA_OFFSET(8)
+ .cfi_def_cfa_offset 8
.endm
-#if !defined(__APPLE__)
- .section .text
-#else
- .section __TEXT,__text
-#endif
+ .text
.file "xray_trampoline_x86.S"
//===----------------------------------------------------------------------===//
- .globl ASM_TSAN_SYMBOL(__xray_FunctionEntry)
+ .globl __xray_FunctionEntry
.align 16, 0x90
- ASM_TYPE_FUNCTION(__xray_FunctionEntry)
-ASM_TSAN_SYMBOL(__xray_FunctionEntry):
- CFI_STARTPROC
+ .type __xray_FunctionEntry,@function
+
+__xray_FunctionEntry:
+ .cfi_startproc
SAVE_REGISTERS
// This load has to be atomic, it's concurrent with __xray_patch().
// On x86/amd64, a simple (type-aligned) MOV instruction is enough.
- movq ASM_TSAN_SYMBOL(_ZN6__xray19XRayPatchedFunctionE)(%rip), %rax
+ movq _ZN6__xray19XRayPatchedFunctionE(%rip), %rax
testq %rax, %rax
je .Ltmp0
.Ltmp0:
RESTORE_REGISTERS
retq
- ASM_SIZE(__xray_FunctionEntry)
- CFI_ENDPROC
+.Ltmp1:
+ .size __xray_FunctionEntry, .Ltmp1-__xray_FunctionEntry
+ .cfi_endproc
//===----------------------------------------------------------------------===//
- .globl ASM_TSAN_SYMBOL(__xray_FunctionExit)
+ .globl __xray_FunctionExit
.align 16, 0x90
- ASM_TYPE_FUNCTION(__xray_FunctionExit)
-ASM_TSAN_SYMBOL(__xray_FunctionExit):
- CFI_STARTPROC
+ .type __xray_FunctionExit,@function
+__xray_FunctionExit:
+ .cfi_startproc
// Save the important registers first. Since we're assuming that this
// function is only jumped into, we only preserve the registers for
// returning.
subq $56, %rsp
- CFI_DEF_CFA_OFFSET(64)
+ .cfi_def_cfa_offset 64
movq %rbp, 48(%rsp)
movupd %xmm0, 32(%rsp)
movupd %xmm1, 16(%rsp)
movq %rax, 8(%rsp)
movq %rdx, 0(%rsp)
- movq ASM_TSAN_SYMBOL(_ZN6__xray19XRayPatchedFunctionE)(%rip), %rax
+ movq _ZN6__xray19XRayPatchedFunctionE(%rip), %rax
testq %rax,%rax
je .Ltmp2
movq 8(%rsp), %rax
movq 0(%rsp), %rdx
addq $56, %rsp
- CFI_DEF_CFA_OFFSET(8)
+ .cfi_def_cfa_offset 8
retq
- ASM_SIZE(__xray_FunctionExit)
- CFI_ENDPROC
+.Ltmp3:
+ .size __xray_FunctionExit, .Ltmp3-__xray_FunctionExit
+ .cfi_endproc
//===----------------------------------------------------------------------===//
- .globl ASM_TSAN_SYMBOL(__xray_FunctionTailExit)
+ .global __xray_FunctionTailExit
.align 16, 0x90
- ASM_TYPE_FUNCTION(__xray_FunctionTailExit)
-ASM_TSAN_SYMBOL(__xray_FunctionTailExit):
- CFI_STARTPROC
+ .type __xray_FunctionTailExit,@function
+__xray_FunctionTailExit:
+ .cfi_startproc
SAVE_REGISTERS
- movq ASM_TSAN_SYMBOL(_ZN6__xray19XRayPatchedFunctionE)(%rip), %rax
+ movq _ZN6__xray19XRayPatchedFunctionE(%rip), %rax
testq %rax,%rax
je .Ltmp4
.Ltmp4:
RESTORE_REGISTERS
retq
- ASM_SIZE(__xray_FunctionTailExit)
- CFI_ENDPROC
+.Ltmp5:
+ .size __xray_FunctionTailExit, .Ltmp5-__xray_FunctionTailExit
+ .cfi_endproc
//===----------------------------------------------------------------------===//
- .globl ASM_TSAN_SYMBOL(__xray_ArgLoggerEntry)
+ .globl __xray_ArgLoggerEntry
.align 16, 0x90
- ASM_TYPE_FUNCTION(__xray_ArgLoggerEntry)
-ASM_TSAN_SYMBOL(__xray_ArgLoggerEntry):
- CFI_STARTPROC
+ .type __xray_ArgLoggerEntry,@function
+__xray_ArgLoggerEntry:
+ .cfi_startproc
SAVE_REGISTERS
// Again, these function pointer loads must be atomic; MOV is fine.
- movq ASM_TSAN_SYMBOL(_ZN6__xray13XRayArgLoggerE)(%rip), %rax
+ movq _ZN6__xray13XRayArgLoggerE(%rip), %rax
testq %rax, %rax
jne .Larg1entryLog
// If [arg1 logging handler] not set, defer to no-arg logging.
- movq ASM_TSAN_SYMBOL(_ZN6__xray19XRayPatchedFunctionE)(%rip), %rax
+ movq _ZN6__xray19XRayPatchedFunctionE(%rip), %rax
testq %rax, %rax
je .Larg1entryFail
.Larg1entryFail:
RESTORE_REGISTERS
retq
- ASM_SIZE(__xray_ArgLoggerEntry)
- CFI_ENDPROC
+
+.Larg1entryEnd:
+ .size __xray_ArgLoggerEntry, .Larg1entryEnd-__xray_ArgLoggerEntry
+ .cfi_endproc
//===----------------------------------------------------------------------===//
- .global ASM_TSAN_SYMBOL(__xray_CustomEvent)
+ .global __xray_CustomEvent
.align 16, 0x90
- ASM_TYPE_FUNCTION(__xray_CustomEvent)
-ASM_TSAN_SYMBOL(__xray_CustomEvent):
- CFI_STARTPROC
+ .type __xray_CustomEvent,@function
+__xray_CustomEvent:
+ .cfi_startproc
SAVE_REGISTERS
// We take two arguments to this trampoline, which should be in rdi and rsi
// already. We also make sure that we stash %rax because we use that register
// to call the logging handler.
- movq ASM_TSAN_SYMBOL(_ZN6__xray22XRayPatchedCustomEventE)(%rip), %rax
+ movq _ZN6__xray22XRayPatchedCustomEventE(%rip), %rax
testq %rax,%rax
je .LcustomEventCleanup
.LcustomEventCleanup:
RESTORE_REGISTERS
retq
- ASM_SIZE(__xray_CustomEvent)
- CFI_ENDPROC
+
+.Ltmp8:
+ .size __xray_CustomEvent, .Ltmp8-__xray_CustomEvent
+ .cfi_endproc
NO_EXEC_STACK_DIRECTIVE
+++ /dev/null
-// Test that the always/never instrument lists apply.
-// RUN: echo "fun:main" > %tmp-always.txt
-// RUN: echo "fun:__xray*" > %tmp-never.txt
-// RUN: %clangxx_xray \
-// RUN: -fxray-never-instrument=%tmp-never.txt \
-// RUN: -fxray-always-instrument=%tmp-always.txt \
-// RUN: %s -o %t
-// RUN: %llvm_xray extract -symbolize %t | \
-// RUN: FileCheck %s --check-prefix NOINSTR
-// RUN: %llvm_xray extract -symbolize %t | \
-// RUN: FileCheck %s --check-prefix ALWAYSINSTR
-// REQUIRES: x86_64-linux
-// REQUIRES: built-in-llvm-tree
-
-// NOINSTR-NOT: {{.*__xray_NeverInstrumented.*}}
-int __xray_NeverInstrumented() {
- return 0;
-}
-
-// ALWAYSINSTR: {{.*function-name:.*main.*}}
-int main(int argc, char *argv[]) {
- return __xray_NeverInstrumented();
-}
+++ /dev/null
-def getRoot(config):
- if not config.parent:
- return config
- return getRoot(config.parent)
-
-root = getRoot(config)
-
-if root.host_os not in ['Darwin']:
- config.unsupported = True
+++ /dev/null
-def getRoot(config):
- if not config.parent:
- return config
- return getRoot(config.parent)
-
-root = getRoot(config)
-
-if root.host_os not in ['Linux']:
- config.unsupported = True
# Default test suffixes.
config.suffixes = ['.c', '.cc', '.cpp']
-if config.host_os not in ['Linux', 'Darwin']:
+if config.host_os not in ['Linux']:
config.unsupported = True
elif '64' not in config.host_arch:
if 'arm' in config.host_arch:
projects / platform / upstream / llvm.git / commitdiff