From 8adb8d5d0d220b0b77b3e3f719f8ffb453a030e8 Mon Sep 17 00:00:00 2001 From: Vedant Kumar Date: Wed, 2 Aug 2017 18:10:36 +0000 Subject: [PATCH] [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 --- compiler-rt/test/ubsan/TestCases/TypeCheck/Linux/PR33221.cpp | 2 +- .../test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp | 2 +- 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 b20ac73..e026e8d 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 898577d..f0659f4 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 -- 2.7.4