summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVedant Kumar <vsk@apple.com>2017-08-02 18:10:36 +0000
committerVedant Kumar <vsk@apple.com>2017-08-02 18:10:36 +0000
commit8adb8d5d0d220b0b77b3e3f719f8ffb453a030e8 (patch)
tree9ff6075d992953ccd7c0cf059d95b9084a7273c2
parenta0c3671b204564ac0c746e22312828643e8d4b11 (diff)
downloadbcm5719-llvm-8adb8d5d0d220b0b77b3e3f719f8ffb453a030e8.tar.gz
bcm5719-llvm-8adb8d5d0d220b0b77b3e3f719f8ffb453a030e8.zip
[ubsan] Test -fsanitize=vptr without -fsanitize=null
This reverts commit r309042, thereby adding a test for -fsanitize=vptr functionality without -fsanitize=null. It also removes -fsanitize=null from another -fsanitize=vptr test. llvm-svn: 309847
-rw-r--r--compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/PR33221.cpp2
-rw-r--r--compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/PR33221.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/PR33221.cpp
index b20ac73aad4..e026e8d057f 100644
--- a/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/PR33221.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/PR33221.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -std=c++11 -frtti -fsanitize=vptr,null -g %s -O3 -o %t
+// RUN: %clangxx -std=c++11 -frtti -fsanitize=vptr -g %s -O3 -o %t
// RUN: %run %t &> %t.log
// RUN: cat %t.log | not count 0 && FileCheck --input-file %t.log %s || cat %t.log | count 0
diff --git a/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
index 898577d8e38..f0659f43943 100644
--- a/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
+++ b/compiler-rt/test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -frtti -fsanitize=vptr,null -fno-sanitize-recover=vptr,null -g %s -O3 -o %t
+// RUN: %clangxx -frtti -fsanitize=vptr -fno-sanitize-recover=vptr,null -g %s -O3 -o %t
// RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-CORRUPTED-VTABLE --strict-whitespace
// UNSUPPORTED: win32
OpenPOWER on IntegriCloud