From eac233c8a8711e52d3ecd7f63815b384dce71e04 Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Thu, 10 Oct 2019 11:03:41 +0000 Subject: [UBSan] Split nullptr-and-nonzero-offset-variable.c in another direction git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@374309 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Pointer/nullptr-and-nonzero-offset-variable.c | 41 ---------------------- .../nullptr-and-nonzero-offset-variable.cpp | 22 ++++++------ 2 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.c diff --git a/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.c b/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.c deleted file mode 100644 index 31e63b7c1..000000000 --- a/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.c +++ /dev/null @@ -1,41 +0,0 @@ -// RUN: %clang -x c -fsanitize=pointer-overflow -O0 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C -// RUN: %clang -x c -fsanitize=pointer-overflow -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C -// RUN: %clang -x c -fsanitize=pointer-overflow -O2 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C -// RUN: %clang -x c -fsanitize=pointer-overflow -O3 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C - -// RUN: %clang -x c -fsanitize=pointer-overflow -O0 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB -// RUN: %clang -x c -fsanitize=pointer-overflow -O1 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB -// RUN: %clang -x c -fsanitize=pointer-overflow -O2 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB -// RUN: %clang -x c -fsanitize=pointer-overflow -O3 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB - -#include -#include - -// Just so deduplication doesn't do anything. -static char *getelementpointer_inbounds_v0(char *base, unsigned long offset) { - // Potentially UB. - return base + offset; -} -static char *getelementpointer_inbounds_v1(char *base, unsigned long offset) { - // Potentially UB. - return base + offset; -} - -int main(int argc, char *argv[]) { - char *base; - unsigned long offset; - - base = (char *)0; - offset = argc - 1; - (void)getelementpointer_inbounds_v0(base, offset); - // CHECK-UB: {{.*}}.c:[[@LINE-14]]:15: runtime error: applying non-zero offset 1 to null pointer - // CHECK-UB-C: {{.*}}.c:[[@LINE-15]]:15: runtime error: applying zero offset to null pointer - - base = (char *)(intptr_t)(argc - 1); - offset = argc == 1 ? 0 : -(argc - 1); - (void)getelementpointer_inbounds_v1(base, offset); - // CHECK-UB: {{.*}}.c:[[@LINE-16]]:15: runtime error: applying non-zero offset to non-null pointer {{.*}} produced null pointer - // CHECK-UB-C: {{.*}}.c:[[@LINE-17]]:15: runtime error: applying zero offset to null pointer - - return 0; -} diff --git a/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.cpp b/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.cpp index 2be702047..ec376c7f5 100644 --- a/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.cpp +++ b/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-variable.cpp @@ -1,8 +1,18 @@ +// RUN: %clang -x c -fsanitize=pointer-overflow -O0 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C +// RUN: %clang -x c -fsanitize=pointer-overflow -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C +// RUN: %clang -x c -fsanitize=pointer-overflow -O2 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C +// RUN: %clang -x c -fsanitize=pointer-overflow -O3 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB-C + // RUN: %clang -x c++ -fsanitize=pointer-overflow -O0 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK // RUN: %clang -x c++ -fsanitize=pointer-overflow -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK // RUN: %clang -x c++ -fsanitize=pointer-overflow -O2 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK // RUN: %clang -x c++ -fsanitize=pointer-overflow -O3 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK +// RUN: %clang -x c -fsanitize=pointer-overflow -O0 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB +// RUN: %clang -x c -fsanitize=pointer-overflow -O1 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB +// RUN: %clang -x c -fsanitize=pointer-overflow -O2 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB +// RUN: %clang -x c -fsanitize=pointer-overflow -O3 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB + // RUN: %clang -x c++ -fsanitize=pointer-overflow -O0 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB // RUN: %clang -x c++ -fsanitize=pointer-overflow -O1 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB // RUN: %clang -x c++ -fsanitize=pointer-overflow -O2 %s -o %t && %run %t I_AM_UB 2>&1 | FileCheck %s --implicit-check-not="error:" --check-prefix=CHECK-UB @@ -16,10 +26,6 @@ static char *getelementpointer_inbounds_v0(char *base, unsigned long offset) { // Potentially UB. return base + offset; } -static char *getelementpointer_inbounds_v1(char *base, unsigned long offset) { - // Potentially UB. - return base + offset; -} int main(int argc, char *argv[]) { char *base; @@ -31,12 +37,8 @@ int main(int argc, char *argv[]) { base = (char *)0; offset = argc - 1; (void)getelementpointer_inbounds_v0(base, offset); - // CHECK-UB: {{.*}}.cpp:[[@LINE-17]]:15: runtime error: applying non-zero offset 1 to null pointer - - base = (char *)(intptr_t)(argc - 1); - offset = argc == 1 ? 0 : -(argc - 1); - (void)getelementpointer_inbounds_v1(base, offset); - // CHECK-UB: {{.*}}.cpp:[[@LINE-18]]:15: runtime error: applying non-zero offset to non-null pointer {{.*}} produced null pointer + // CHECK-UB: {{.*}}.cpp:[[@LINE-13]]:15: runtime error: applying non-zero offset 1 to null pointer + // CHECK-UB-C: {{.*}}.cpp:[[@LINE-14]]:15: runtime error: applying zero offset to null pointer return 0; } -- cgit v1.2.1