[llvm-commits] [compiler-rt] r171278 - in /compiler-rt/trunk/lib/ubsan: lit_tests/Integer/negate-overflow.cpp ubsan_handlers.cc

[Will Dietz]

Author: wdietz2
Date: Mon Dec 31 00:36:44 2012
New Revision: 171278

URL: http://llvm.org/viewvc/llvm-project?rev=171278&view=rev
Log:
[ubsan] Don't suggest casting to unsigned for unsigned unary minus overflow.

Fixed version of r171273.

Modified:
    compiler-rt/trunk/lib/ubsan/lit_tests/Integer/negate-overflow.cpp
    compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc

Modified: compiler-rt/trunk/lib/ubsan/lit_tests/Integer/negate-overflow.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/lit_tests/Integer/negate-overflow.cpp?rev=171278&r1=171277&r2=171278&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/lit_tests/Integer/negate-overflow.cpp (original)
+++ compiler-rt/trunk/lib/ubsan/lit_tests/Integer/negate-overflow.cpp Mon Dec 31 00:36:44 2012
@@ -1,7 +1,12 @@
-// RUN: %clang -fsanitize=signed-integer-overflow %s -o %t && %t 2>&1 | FileCheck %s
+// 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
 
 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
-  // 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
+  // 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
   return -(-0x7fffffff - 1);
 }

Modified: compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc?rev=171278&r1=171277&r2=171278&view=diff
==============================================================================
--- compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc (original)
+++ compiler-rt/trunk/lib/ubsan/ubsan_handlers.cc Mon Dec 31 00:36:44 2012
@@ -103,10 +103,15 @@
 
 void __ubsan::__ubsan_handle_negate_overflow(OverflowData *Data,
                                              ValueHandle OldVal) {
-  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;
+  if (Data->Type.isSignedIntegerTy())
+    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;
+  else
+    Diag(Data->Loc, DL_Error,
+         "negation of %0 cannot be represented in type %1")
+      << Value(Data->Type, OldVal) << Data->Type;
 }
 void __ubsan::__ubsan_handle_negate_overflow_abort(OverflowData *Data,
                                                     ValueHandle OldVal) {