[compiler-rt] r276187 - revert rL276179: [compiler-rt] Fix broken unittest related to 64-bit print format

[Etienne Bergeron via llvm-commits]

Author: etienneb
Date: Wed Jul 20 16:38:02 2016
New Revision: 276187

URL: http://llvm.org/viewvc/llvm-project?rev=276187&view=rev
Log:
revert rL276179: [compiler-rt] Fix broken unittest related to 64-bit print format

Modified:
    compiler-rt/trunk/test/asan/TestCases/debug_mapping.cc
    compiler-rt/trunk/test/asan/TestCases/debug_stacks.cc

Modified: compiler-rt/trunk/test/asan/TestCases/debug_mapping.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/debug_mapping.cc?rev=276187&r1=276186&r2=276187&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/debug_mapping.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/debug_mapping.cc Wed Jul 20 16:38:02 2016
@@ -15,7 +15,7 @@ int main() {
   __asan_get_shadow_mapping(&scale, &offset);
 
   fprintf(stderr, "scale: %d\n", (int)scale);
-  fprintf(stderr, "offset: 0x%zx\n", offset);
+  fprintf(stderr, "offset: 0x%lx\n", offset);
 
   // CHECK: scale: [[SCALE]]
   // CHECK: offset: [[OFFSET]]

Modified: compiler-rt/trunk/test/asan/TestCases/debug_stacks.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/debug_stacks.cc?rev=276187&r1=276186&r2=276187&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/debug_stacks.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/debug_stacks.cc Wed Jul 20 16:38:02 2016
@@ -8,7 +8,6 @@
 #include <sanitizer/asan_interface.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 char *mem;
 void func1() {
@@ -36,9 +35,9 @@ int main() {
   // CHECK: alloc stack retval ok
   fprintf(stderr, "thread id = %d\n", thread_id);
   // CHECK: thread id = 0
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[0]);
+  fprintf(stderr, "0x%lx\n", trace[0]);
   // CHECK: [[ALLOC_FRAME_0:0x[0-9a-f]+]]
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[1]);
+  fprintf(stderr, "0x%lx\n", trace[1]);
   // CHECK: [[ALLOC_FRAME_1:0x[0-9a-f]+]]
 
   num_frames = 100;
@@ -49,9 +48,9 @@ int main() {
   // CHECK: free stack retval ok
   fprintf(stderr, "thread id = %d\n", thread_id);
   // CHECK: thread id = 0
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[0]);
+  fprintf(stderr, "0x%lx\n", trace[0]);
   // CHECK: [[FREE_FRAME_0:0x[0-9a-f]+]]
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[1]);
+  fprintf(stderr, "0x%lx\n", trace[1]);
   // CHECK: [[FREE_FRAME_1:0x[0-9a-f]+]]
 
   mem[0] = 'A'; // BOOM