replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[UBSan] Don't link UBSan runtime into shared libraries. 

It used to be a feature of UBSan (it could sanitize a standalone
shared object instead of the whole program), but now it causes
more problems, like PR20165.

llvm-svn: 212064
This commit is contained in:
Alexey Samsonov 2014-06-30 20:27:16 +00:00
parent ba405c22b8
commit c6496816b1
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/lib/Driver/Tools.cpp
View File

@ -2039,23 +2039,21 @@ static void addLsanRT(const ToolChain &TC, const ArgList &Args,
static void addUbsanRT(const ToolChain &TC, const ArgList &Args,
ArgStringList &CmdArgs, bool IsCXX,
bool HasOtherSanitizerRt) {
// Export symbols if we're not building a shared library. This allows two
// models: either every DSO containing ubsan-sanitized code contains the
// ubsan runtime, or the main executable does (or both).
const bool ExportSymbols = !Args.hasArg(options::OPT_shared);
// Do not link runtime into shared libraries.
if (Args.hasArg(options::OPT_shared))
return;
// Need a copy of sanitizer_common. This could come from another sanitizer
// runtime; if we're not including one, include our own copy.
if (!HasOtherSanitizerRt)
addSanitizerRTLinkFlags(TC, Args, CmdArgs, "san", true, false);
addSanitizerRTLinkFlags(TC, Args, CmdArgs, "ubsan", false, ExportSymbols);
addSanitizerRTLinkFlags(TC, Args, CmdArgs, "ubsan", false, true);
// Only include the bits of the runtime which need a C++ ABI library if
// we're linking in C++ mode.
if (IsCXX)
addSanitizerRTLinkFlags(TC, Args, CmdArgs, "ubsan_cxx", false,
ExportSymbols);
addSanitizerRTLinkFlags(TC, Args, CmdArgs, "ubsan_cxx", false, true);
}
static void addDfsanRT(const ToolChain &TC, const ArgList &Args,

2
clang/test/Driver/sanitizer-ld.c
View File

@ -246,7 +246,7 @@
// CHECK-UBSAN-LINUX-SHARED: "{{.*}}ld{{(.exe)?}}"
// CHECK-UBSAN-LINUX-SHARED-NOT: --export-dynamic
// CHECK-UBSAN-LINUX-SHARED-NOT: --dynamic-list
// CHECK-UBSAN-LINUX-SHARED: libclang_rt.ubsan-i386.a"
// CHECK-UBSAN-LINUX-SHARED-NOT: libclang_rt.ubsan-i386.a"
// CHECK-UBSAN-LINUX-SHARED-NOT: --export-dynamic
// CHECK-UBSAN-LINUX-SHARED-NOT: --dynamic-list