[llvm-commits] [test-suite] r107954 - in /test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large: cast.cpp cast.reference_output

[Bob Wilson]

Author: bwilson
Date: Thu Jul  8 23:09:30 2010
New Revision: 107954

URL: http://llvm.org/viewvc/llvm-project?rev=107954&view=rev
Log:
Modify SingleSource/UnitTests/SignlessTypes/Large/cast to use "long long"
instead of "long" so that it gets consistent results for 32-bit and 64-bit
systems.

Modified:
    test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.cpp
    test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.reference_output

Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.cpp?rev=107954&r1=107953&r2=107954&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.cpp (original)
+++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.cpp Thu Jul  8 23:09:30 2010
@@ -53,14 +53,14 @@
     TRIPLECAST(i, signed   int, unsigned int, signed   int);
     TRIPLECAST(i, signed   int, signed   int, unsigned int);
     TRIPLECAST(i, signed   int, signed   int, signed   int);
-    TRIPLECAST(i, unsigned long, unsigned long, unsigned long);
-    TRIPLECAST(i, unsigned long, unsigned long, signed   long);
-    TRIPLECAST(i, unsigned long, signed   long, unsigned long);
-    TRIPLECAST(i, unsigned long, signed   long, signed   long);
-    TRIPLECAST(i, signed   long, unsigned long, unsigned long);
-    TRIPLECAST(i, signed   long, unsigned long, signed   long);
-    TRIPLECAST(i, signed   long, signed   long, unsigned long);
-    TRIPLECAST(i, signed   long, signed   long, signed   long);
+    TRIPLECAST(i, unsigned long long, unsigned long long, unsigned long long);
+    TRIPLECAST(i, unsigned long long, unsigned long long, signed   long long);
+    TRIPLECAST(i, unsigned long long, signed   long long, unsigned long long);
+    TRIPLECAST(i, unsigned long long, signed   long long, signed   long long);
+    TRIPLECAST(i, signed   long long, unsigned long long, unsigned long long);
+    TRIPLECAST(i, signed   long long, unsigned long long, signed   long long);
+    TRIPLECAST(i, signed   long long, signed   long long, unsigned long long);
+    TRIPLECAST(i, signed   long long, signed   long long, signed   long long);
 
     // Same size through larger size
     TRIPLECAST(i, unsigned char, unsigned short, unsigned char);
@@ -79,14 +79,14 @@
     TRIPLECAST(i, signed   short, unsigned int, signed   short);
     TRIPLECAST(i, signed   short, signed   int, unsigned short);
     TRIPLECAST(i, signed   short, signed   int, signed   short);
-    TRIPLECAST(i, unsigned int, unsigned long, unsigned int);
-    TRIPLECAST(i, unsigned int, unsigned long, signed   int);
-    TRIPLECAST(i, unsigned int, signed   long, unsigned int);
-    TRIPLECAST(i, unsigned int, signed   long, signed   int);
-    TRIPLECAST(i, signed   int, unsigned long, unsigned int);
-    TRIPLECAST(i, signed   int, unsigned long, signed   int);
-    TRIPLECAST(i, signed   int, signed   long, unsigned int);
-    TRIPLECAST(i, signed   int, signed   long, signed   int);
+    TRIPLECAST(i, unsigned int, unsigned long long, unsigned int);
+    TRIPLECAST(i, unsigned int, unsigned long long, signed   int);
+    TRIPLECAST(i, unsigned int, signed   long long, unsigned int);
+    TRIPLECAST(i, unsigned int, signed   long long, signed   int);
+    TRIPLECAST(i, signed   int, unsigned long long, unsigned int);
+    TRIPLECAST(i, signed   int, unsigned long long, signed   int);
+    TRIPLECAST(i, signed   int, signed   long long, unsigned int);
+    TRIPLECAST(i, signed   int, signed   long long, signed   int);
 
     // Larger size through smaller size
     TRIPLECAST(i, unsigned short, unsigned char, unsigned short);
@@ -105,14 +105,14 @@
     TRIPLECAST(i, signed   int, unsigned short, signed   int);
     TRIPLECAST(i, signed   int, signed   short, unsigned int);
     TRIPLECAST(i, signed   int, signed   short, signed   int);
-    TRIPLECAST(i, unsigned long, unsigned int, unsigned long);
-    TRIPLECAST(i, unsigned long, unsigned int, signed   long);
-    TRIPLECAST(i, unsigned long, signed   int, unsigned long);
-    TRIPLECAST(i, unsigned long, signed   int, signed   long);
-    TRIPLECAST(i, signed   long, unsigned int, unsigned long);
-    TRIPLECAST(i, signed   long, unsigned int, signed   long);
-    TRIPLECAST(i, signed   long, signed   int, unsigned long);
-    TRIPLECAST(i, signed   long, signed   int, signed   long);
+    TRIPLECAST(i, unsigned long long, unsigned int, unsigned long long);
+    TRIPLECAST(i, unsigned long long, unsigned int, signed   long long);
+    TRIPLECAST(i, unsigned long long, signed   int, unsigned long long);
+    TRIPLECAST(i, unsigned long long, signed   int, signed   long long);
+    TRIPLECAST(i, signed   long long, unsigned int, unsigned long long);
+    TRIPLECAST(i, signed   long long, unsigned int, signed   long long);
+    TRIPLECAST(i, signed   long long, signed   int, unsigned long long);
+    TRIPLECAST(i, signed   long long, signed   int, signed   long long);
   }
 
   // Check cast to bool
@@ -123,7 +123,7 @@
   printf("%d(%s) -> bool = %d\n", num, #type, (int)X); \
 }
   CASTTOBOOL(testVal, float);
-  CASTTOBOOL(testVal, long);
+  CASTTOBOOL(testVal, long long);
   CASTTOBOOL(testVal, unsigned int);
   CASTTOBOOL(testVal, signed char);
   CASTTOBOOL(testVal, bool);
@@ -132,8 +132,8 @@
   {
     static int sillyArray[8] = { 2, 3, 5, 7, 11, 13, 17, 19 };
     int* i_ptr = &sillyArray[ 0 ];
-    long* l_ptr = (long*) i_ptr;
-    printf("%ld\n", *l_ptr);
+    long long* l_ptr = (long long*) i_ptr;
+    printf("%lld\n", *l_ptr);
   }
   
   // Cast of malloc result to another type

Modified: test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.reference_output
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.reference_output?rev=107954&r1=107953&r2=107954&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.reference_output (original)
+++ test-suite/trunk/SingleSource/UnitTests/SignlessTypes/Large/cast.reference_output Thu Jul  8 23:09:30 2010
@@ -1 +1 @@
-94065e9e573f77ad46c41ab1a921f5ca
+bf802c2212eb710077f8ca6b8825f644