Author: rsmith
Date: Fri Nov 30 19:02:45 2012
New Revision: 169066
URL: http://llvm.org/viewvc/llvm-project?rev=169066&view=rev
Log:
Remove restriction on combining ubsan with asan or tsan. This has worked for a
while.
Modified:
cfe/trunk/lib/Driver/Tools.cpp
cfe/trunk/test/Driver/fsanitize.c
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=169066&r1=169065&r2=169066&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Fri Nov 30 19:02:45 2012
@@ -1466,14 +1466,12 @@
}
// Only one runtime library can be used at once.
- // FIXME: Allow Ubsan to be combined with the other two.
bool NeedsAsan = needsAsanRt();
bool NeedsTsan = needsTsanRt();
- bool NeedsUbsan = needsUbsanRt();
- if (NeedsAsan + NeedsTsan + NeedsUbsan > 1)
+ if (NeedsAsan && NeedsTsan)
D.Diag(diag::err_drv_argument_not_allowed_with)
- << lastArgumentForKind(D, Args, NeedsAsan ? NeedsAsanRt : NeedsTsanRt)
- << lastArgumentForKind(D, Args, NeedsUbsan ? NeedsUbsanRt : NeedsTsanRt);
+ << lastArgumentForKind(D, Args, NeedsAsanRt)
+ << lastArgumentForKind(D, Args, NeedsTsanRt);
// If -fsanitize contains extra features of ASan, it should also
// explicitly contain -fsanitize=address.
@@ -1545,6 +1543,7 @@
TC.getArchName() + ".a"));
CmdArgs.push_back(Args.MakeArgString(LibUbsan));
CmdArgs.push_back("-lpthread");
+ CmdArgs.push_back("-export-dynamic");
}
}
Modified: cfe/trunk/test/Driver/fsanitize.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize.c?rev=169066&r1=169065&r2=169066&view=diff
==============================================================================
--- cfe/trunk/test/Driver/fsanitize.c (original)
+++ cfe/trunk/test/Driver/fsanitize.c Fri Nov 30 19:02:45 2012
@@ -26,11 +26,11 @@
// RUN: %clang -target x86_64-linux-gnu -fsanitize=init-order %s -c -o
/dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-ONLY-EXTRA-ASAN
// CHECK-ONLY-EXTRA-ASAN: argument '-fsanitize=init-order' only allowed with
'-fsanitize=address'
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=address
-fsanitize=alignment -fsanitize=vptr -fno-sanitize=vptr %s -c -o /dev/null 2>&1
| FileCheck %s --check-prefix=CHECK-UBSAN-ASAN
-// CHECK-UBSAN-ASAN: '-fsanitize=address' not allowed with
'-fsanitize=alignment'
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address
-fsanitize=alignment -fsanitize=vptr -fno-sanitize=vptr %s -c -o /dev/null 2>&1
+// OK
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr
-fsanitize=undefined,address %s -c -o /dev/null 2>&1 | FileCheck %s
--check-prefix=CHECK-VPTR-UBSAN-ASAN
-// CHECK-VPTR-UBSAN-ASAN: '-fsanitize=address' not allowed with
'-fsanitize=undefined'
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=vptr -fno-sanitize=vptr
-fsanitize=undefined,address %s -c -o /dev/null 2>&1
+// OK
// RUN: %clang -target x86_64-linux-gnu -fcatch-undefined-behavior
-fthread-sanitizer -fno-thread-sanitizer -faddress-sanitizer
-fno-address-sanitizer -fbounds-checking -c -o /dev/null %s 2>&1 | FileCheck %s
--check-prefix=CHECK-DEPRECATED
// CHECK-DEPRECATED: argument '-fcatch-undefined-behavior' is deprecated, use
'-fsanitize=undefined' instead
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
