Skip to content

Commit 870eee4

Browse files
vitalybukavporpo
andauthored
[NFC][asan] Use %p to print addresses (#98575)
Co-authored-by: vporpo <[email protected]>
1 parent 10df988 commit 870eee4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

compiler-rt/lib/asan/asan_descriptions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static void DescribeAddressRelativeToGlobal(uptr addr, uptr access_size,
292292
str.AppendF(" global variable '%s' defined in '",
293293
MaybeDemangleGlobalName(g.name));
294294
PrintGlobalLocation(&str, g, /*print_module_name=*/false);
295-
str.AppendF("' (0x%zx) of size %zu\n", g.beg, g.size);
295+
str.AppendF("' (%p) of size %zu\n", (void *)g.beg, g.size);
296296
str.Append(d.Default());
297297
PrintGlobalNameIfASCII(&str, g);
298298
Printf("%s", str.data());

compiler-rt/lib/asan/asan_rtl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ void PrintAddressSpaceLayout() {
382382

383383
Printf("SHADOW_SCALE: %d\n", (int)ASAN_SHADOW_SCALE);
384384
Printf("SHADOW_GRANULARITY: %d\n", (int)ASAN_SHADOW_GRANULARITY);
385-
Printf("SHADOW_OFFSET: 0x%zx\n", (uptr)ASAN_SHADOW_OFFSET);
385+
Printf("SHADOW_OFFSET: %p\n", (void *)ASAN_SHADOW_OFFSET);
386386
CHECK(ASAN_SHADOW_SCALE >= 3 && ASAN_SHADOW_SCALE <= 7);
387387
if (kMidMemBeg)
388388
CHECK(kMidShadowBeg > kLowShadowEnd &&

compiler-rt/test/asan/TestCases/debug_mapping.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// printed because of verbosity=1
1616
// CHECK: SHADOW_SCALE: [[SCALE:[0-9]+]]
17-
// CHECK: SHADOW_OFFSET: [[OFFSET:0x[0-9a-f]+]]
17+
// CHECK: SHADOW_OFFSET: 0x{{0*}}[[OFFSET:[0-9a-f]+]]
1818

1919
int main() {
2020
size_t scale, offset;
@@ -24,7 +24,7 @@ int main() {
2424
fprintf(stderr, "offset: 0x" PTR "\n", (void*)offset);
2525

2626
// CHECK: scale: [[SCALE]]
27-
// CHECK: offset: [[OFFSET]]
27+
// CHECK: offset: 0x{{0*}}[[OFFSET]]
2828

2929
return 0;
3030
}

0 commit comments

Comments
 (0)