diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-12-31 06:16:47 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-12-31 06:16:47 +0000 |
| commit | 5f8061bc3697721aaa55734e291a5c6bd5b37d58 (patch) | |
| tree | 8b17a79afe2cfd6aa425ed825ba82c815fa6f1a4 /compiler-rt | |
| parent | e70a813b599a0a93d2e4aa8030c169c2980ca96c (diff) | |
| download | bcm5719-llvm-5f8061bc3697721aaa55734e291a5c6bd5b37d58.tar.gz bcm5719-llvm-5f8061bc3697721aaa55734e291a5c6bd5b37d58.zip | |
Revert r171273 which doesn't actually compile.
Original commit message:
[ubsan] Don't suggest casting to unsigned for unsigned unary minus overflow.
llvm-svn: 171277
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp | 9 | ||||
| -rw-r--r-- | compiler-rt/lib/ubsan/ubsan_handlers.cc | 13 |
2 files changed, 6 insertions, 16 deletions
diff --git a/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp b/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp index 2ee4f10115e..e3beb6b57a4 100644 --- a/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp +++ b/compiler-rt/lib/ubsan/lit_tests/Integer/negate-overflow.cpp @@ -1,12 +1,7 @@ -// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECKS -// RUN: %clang -fsanitize=unsigned-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s --check-prefix=CHECKU +// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s int main() { - // CHECKS-NOT: runtime error - // CHECKU: negate-overflow.cpp:[[@LINE+2]]:3: runtime error: negation of 2147483648 cannot be represented in type 'unsigned int' - // CHECKU-NOT: cast to an unsigned -unsigned(-0x7fffffff - 1); // ok - // CHECKS: negate-overflow.cpp:[[@LINE+2]]:10: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself - // CHECKU-NOT: runtime error + // CHECK: negate-overflow.cpp:6:10: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself return -(-0x7fffffff - 1); } diff --git a/compiler-rt/lib/ubsan/ubsan_handlers.cc b/compiler-rt/lib/ubsan/ubsan_handlers.cc index 562a90308e4..5e73c04ee31 100644 --- a/compiler-rt/lib/ubsan/ubsan_handlers.cc +++ b/compiler-rt/lib/ubsan/ubsan_handlers.cc @@ -103,15 +103,10 @@ void __ubsan::__ubsan_handle_mul_overflow_abort(OverflowData *Data, void __ubsan::__ubsan_handle_negate_overflow(OverflowData *Data, ValueHandle OldVal) { - if (Data->Type.isSignedIntegerTy()) - Diag(Loc, DL_Error, - "negation of %0 cannot be represented in type %1; " - "cast to an unsigned type to negate this value to itself") - << Value(Data->Type, OldVal) << Data->Type; - else - Diag(Loc, DL_Error, - "negation of %0 cannot be represented in type %1") - << Value(Data->Type, OldVal) << Data->Type; + Diag(Data->Loc, DL_Error, + "negation of %0 cannot be represented in type %1; " + "cast to an unsigned type to negate this value to itself") + << Value(Data->Type, OldVal) << Data->Type; } void __ubsan::__ubsan_handle_negate_overflow_abort(OverflowData *Data, ValueHandle OldVal) { |
