[llvm-branch-commits] [compiler-rt-branch] r196870 - Merging r196612:

[Bill Wendling]

Author: void
Date: Mon Dec  9 22:30:17 2013
New Revision: 196870

URL: http://llvm.org/viewvc/llvm-project?rev=196870&view=rev
Log:
Merging r196612:
------------------------------------------------------------------------
r196612 | wdietz2 | 2013-12-06 13:49:18 -0800 (Fri, 06 Dec 2013) | 1 line

Fix integer tests on platforms where uint64_t is 'unsigned long long'.
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_34/   (props changed)
    compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp
    compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp
    compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp

Propchange: compiler-rt/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec  9 22:30:17 2013
@@ -1 +1 @@
-/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501
+/compiler-rt/trunk:195427,195433-195434,195436,195442,195570,195642-195643,195652,195791,196501,196612

Modified: compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp?rev=196870&r1=196869&r2=196870&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp (original)
+++ compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/no-recover.cpp Mon Dec  9 22:30:17 2013
@@ -17,6 +17,6 @@ int main() {
   // ABORT: no-recover.cpp:[[@LINE-2]]:5: runtime error: unsigned integer overflow: 2271560481 + 3989547399 cannot be represented in type 'unsigned int'
 
   (void)(uint64_t(10000000000000000000ull) + uint64_t(9000000000000000000ull));
-  // RECOVER: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned long'
+  // RECOVER: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned {{long( long)?}}'
   // ABORT-NOT: runtime error
 }

Modified: compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp?rev=196870&r1=196869&r2=196870&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp (original)
+++ compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/uadd-overflow.cpp Mon Dec  9 22:30:17 2013
@@ -18,7 +18,7 @@ int main() {
 
 #ifdef ADD_I64
   (void)(uint64_t(10000000000000000000ull) + uint64_t(9000000000000000000ull));
-  // CHECK-ADD_I64: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned long'
+  // CHECK-ADD_I64: 10000000000000000000 + 9000000000000000000 cannot be represented in type 'unsigned {{long( long)?}}'
 #endif
 
 #ifdef ADD_I128

Modified: compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp?rev=196870&r1=196869&r2=196870&view=diff
==============================================================================
--- compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp (original)
+++ compiler-rt/branches/release_34/lib/ubsan/lit_tests/TestCases/Integer/usub-overflow.cpp Mon Dec  9 22:30:17 2013
@@ -17,7 +17,7 @@ int main() {
 
 #ifdef SUB_I64
   (void)(uint64_t(8000000000000000000ll) - uint64_t(9000000000000000000ll));
-  // CHECK-SUB_I64: 8000000000000000000 - 9000000000000000000 cannot be represented in type 'unsigned long'
+  // CHECK-SUB_I64: 8000000000000000000 - 9000000000000000000 cannot be represented in type 'unsigned {{long( long)?}}'
 #endif
 
 #ifdef SUB_I128