diff options
| -rw-r--r-- | compiler-rt/test/asan/TestCases/debug_mapping.cc | 8 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/debug_stacks.cc | 14 |
2 files changed, 17 insertions, 5 deletions
diff --git a/compiler-rt/test/asan/TestCases/debug_mapping.cc b/compiler-rt/test/asan/TestCases/debug_mapping.cc index bd05f6aab35..40083f02853 100644 --- a/compiler-rt/test/asan/TestCases/debug_mapping.cc +++ b/compiler-rt/test/asan/TestCases/debug_mapping.cc @@ -6,6 +6,12 @@ #include <stdio.h> #include <stdlib.h> +#if _WIN64 +#define PTR "%llx" +#else +#define PTR "%lx" +#endif + // printed because of verbosity=1 // CHECK: SHADOW_SCALE: [[SCALE:[0-9]+]] // CHECK: SHADOW_OFFSET: [[OFFSET:0x[0-9a-f]+]] @@ -15,7 +21,7 @@ int main() { __asan_get_shadow_mapping(&scale, &offset); fprintf(stderr, "scale: %d\n", (int)scale); - fprintf(stderr, "offset: 0x%lx\n", offset); + fprintf(stderr, "offset: 0x" PTR "\n", (void*)offset); // CHECK: scale: [[SCALE]] // CHECK: offset: [[OFFSET]] diff --git a/compiler-rt/test/asan/TestCases/debug_stacks.cc b/compiler-rt/test/asan/TestCases/debug_stacks.cc index 857e905094b..7c320bfcb2d 100644 --- a/compiler-rt/test/asan/TestCases/debug_stacks.cc +++ b/compiler-rt/test/asan/TestCases/debug_stacks.cc @@ -5,6 +5,12 @@ // FIXME: Figure out why allocation/free stack traces may be too short on ARM. // REQUIRES: stable-runtime +#if _WIN64 +#define PTR "%llx" +#else +#define PTR "%lx" +#endif + #include <sanitizer/asan_interface.h> #include <stdio.h> #include <stdlib.h> @@ -35,9 +41,9 @@ int main() { // CHECK: alloc stack retval ok fprintf(stderr, "thread id = %d\n", thread_id); // CHECK: thread id = 0 - fprintf(stderr, "0x%lx\n", trace[0]); + fprintf(stderr, "0x" PTR "\n", trace[0]); // CHECK: [[ALLOC_FRAME_0:0x[0-9a-f]+]] - fprintf(stderr, "0x%lx\n", trace[1]); + fprintf(stderr, "0x" PTR "\n", trace[1]); // CHECK: [[ALLOC_FRAME_1:0x[0-9a-f]+]] num_frames = 100; @@ -48,9 +54,9 @@ int main() { // CHECK: free stack retval ok fprintf(stderr, "thread id = %d\n", thread_id); // CHECK: thread id = 0 - fprintf(stderr, "0x%lx\n", trace[0]); + fprintf(stderr, "0x" PTR "\n", trace[0]); // CHECK: [[FREE_FRAME_0:0x[0-9a-f]+]] - fprintf(stderr, "0x%lx\n", trace[1]); + fprintf(stderr, "0x" PTR "\n", trace[1]); // CHECK: [[FREE_FRAME_1:0x[0-9a-f]+]] mem[0] = 'A'; // BOOM |
