Skip to content

Commit 572d1ec

Browse files
committed
[ASan] Missed some SHADOW_XYZ uses on non-Linux platforms.
Reviewed By: kstoimenov Differential Revision: https://reviews.llvm.org/D115307
1 parent ad56941 commit 572d1ec

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

compiler-rt/lib/asan/asan_mac.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void *AsanDoesNotSupportStaticLinkage() {
5555
}
5656

5757
uptr FindDynamicShadowStart() {
58-
return MapDynamicShadow(MemToShadowSize(kHighMemEnd), SHADOW_SCALE,
58+
return MapDynamicShadow(MemToShadowSize(kHighMemEnd), ASAN_SHADOW_SCALE,
5959
/*min_shadow_base_alignment*/ 0, kHighMemEnd);
6060
}
6161

compiler-rt/lib/asan/asan_mapping_sparc64.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@
2525
// The idea is to chop the high bits before doing the scaling, so the two
2626
// parts become contiguous again and the usual scheme can be applied.
2727

28-
#define MEM_TO_SHADOW(mem) \
29-
((((mem) << HIGH_BITS) >> (HIGH_BITS + (SHADOW_SCALE))) + (SHADOW_OFFSET))
28+
#define MEM_TO_SHADOW(mem) \
29+
((((mem) << HIGH_BITS) >> (HIGH_BITS + (ASAN_SHADOW_SCALE))) + \
30+
(ASAN_SHADOW_OFFSET))
3031

3132
#define kLowMemBeg 0
32-
#define kLowMemEnd (SHADOW_OFFSET - 1)
33+
#define kLowMemEnd (ASAN_SHADOW_OFFSET - 1)
3334

34-
#define kLowShadowBeg SHADOW_OFFSET
35+
#define kLowShadowBeg ASAN_SHADOW_OFFSET
3536
#define kLowShadowEnd MEM_TO_SHADOW(kLowMemEnd)
3637

3738
// But of course there is the huge hole between the high shadow memory,

compiler-rt/lib/asan/asan_premap_shadow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace __asan {
2626
// Conservative upper limit.
2727
uptr PremapShadowSize() {
2828
uptr granularity = GetMmapGranularity();
29-
return RoundUpTo(GetMaxVirtualAddress() >> SHADOW_SCALE, granularity);
29+
return RoundUpTo(GetMaxVirtualAddress() >> ASAN_SHADOW_SCALE, granularity);
3030
}
3131

3232
// Returns an address aligned to 8 pages, such that one page on the left and

compiler-rt/lib/asan/asan_win.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void *AsanDoesNotSupportStaticLinkage() {
253253
}
254254

255255
uptr FindDynamicShadowStart() {
256-
return MapDynamicShadow(MemToShadowSize(kHighMemEnd), SHADOW_SCALE,
256+
return MapDynamicShadow(MemToShadowSize(kHighMemEnd), ASAN_SHADOW_SCALE,
257257
/*min_shadow_base_alignment*/ 0, kHighMemEnd);
258258
}
259259

0 commit comments

Comments
 (0)