Skip to content

Commit ad56941

Browse files
kstoimenovkstoimenov
committed
[ASan] Renamed SHADOW_XYZ to ASAN_SHADOW_XYZ.
Follow up from D115271. Reviewed By: vitalybuka Differential Revision: https://reviews.llvm.org/D115293
1 parent 8a1f2d6 commit ad56941

13 files changed

+124
-119
lines changed

‎compiler-rt/lib/asan/asan_activation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void AsanDeactivate() {
112112
disabled.quarantine_size_mb = 0;
113113
disabled.thread_local_quarantine_size_kb = 0;
114114
// Redzone must be at least Max(16, granularity) bytes long.
115-
disabled.min_redzone = Max(16, (int)SHADOW_GRANULARITY);
115+
disabled.min_redzone = Max(16, (int)ASAN_SHADOW_GRANULARITY);
116116
disabled.max_redzone = disabled.min_redzone;
117117
disabled.alloc_dealloc_mismatch = false;
118118
disabled.may_return_null = true;

‎compiler-rt/lib/asan/asan_allocator.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@ struct QuarantineCallback {
210210
CHECK_EQ(old_chunk_state, CHUNK_QUARANTINE);
211211
}
212212

213-
PoisonShadow(m->Beg(),
214-
RoundUpTo(m->UsedSize(), SHADOW_GRANULARITY),
213+
PoisonShadow(m->Beg(), RoundUpTo(m->UsedSize(), ASAN_SHADOW_GRANULARITY),
215214
kAsanHeapLeftRedzoneMagic);
216215

217216
// Statistics.
@@ -357,7 +356,7 @@ struct Allocator {
357356
if (chunk < beg && beg < end && end <= chunk_end) {
358357
// Looks like a valid AsanChunk in use, poison redzones only.
359358
PoisonShadow(chunk, beg - chunk, kAsanHeapLeftRedzoneMagic);
360-
uptr end_aligned_down = RoundDownTo(end, SHADOW_GRANULARITY);
359+
uptr end_aligned_down = RoundDownTo(end, ASAN_SHADOW_GRANULARITY);
361360
FastPoisonShadowPartialRightRedzone(
362361
end_aligned_down, end - end_aligned_down,
363362
chunk_end - end_aligned_down, kAsanHeapLeftRedzoneMagic);
@@ -482,7 +481,7 @@ struct Allocator {
482481
}
483482
Flags &fl = *flags();
484483
CHECK(stack);
485-
const uptr min_alignment = SHADOW_GRANULARITY;
484+
const uptr min_alignment = ASAN_SHADOW_GRANULARITY;
486485
const uptr user_requested_alignment_log =
487486
ComputeUserRequestedAlignmentLog(alignment);
488487
if (alignment < min_alignment)
@@ -563,15 +562,15 @@ struct Allocator {
563562
m->SetAllocContext(t ? t->tid() : kMainTid, StackDepotPut(*stack));
564563

565564
uptr size_rounded_down_to_granularity =
566-
RoundDownTo(size, SHADOW_GRANULARITY);
565+
RoundDownTo(size, ASAN_SHADOW_GRANULARITY);
567566
// Unpoison the bulk of the memory region.
568567
if (size_rounded_down_to_granularity)
569568
PoisonShadow(user_beg, size_rounded_down_to_granularity, 0);
570569
// Deal with the end of the region if size is not aligned to granularity.
571570
if (size != size_rounded_down_to_granularity && CanPoisonMemory()) {
572571
u8 *shadow =
573572
(u8 *)MemToShadow(user_beg + size_rounded_down_to_granularity);
574-
*shadow = fl.poison_partial ? (size & (SHADOW_GRANULARITY - 1)) : 0;
573+
*shadow = fl.poison_partial ? (size & (ASAN_SHADOW_GRANULARITY - 1)) : 0;
575574
}
576575

577576
AsanStats &thread_stats = GetCurrentThreadStats();
@@ -641,8 +640,7 @@ struct Allocator {
641640
}
642641

643642
// Poison the region.
644-
PoisonShadow(m->Beg(),
645-
RoundUpTo(m->UsedSize(), SHADOW_GRANULARITY),
643+
PoisonShadow(m->Beg(), RoundUpTo(m->UsedSize(), ASAN_SHADOW_GRANULARITY),
646644
kAsanHeapFreeMagic);
647645

648646
AsanStats &thread_stats = GetCurrentThreadStats();

‎compiler-rt/lib/asan/asan_debugging.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ uptr __asan_get_free_stack(uptr addr, uptr *trace, uptr size, u32 *thread_id) {
141141
SANITIZER_INTERFACE_ATTRIBUTE
142142
void __asan_get_shadow_mapping(uptr *shadow_scale, uptr *shadow_offset) {
143143
if (shadow_scale)
144-
*shadow_scale = SHADOW_SCALE;
144+
*shadow_scale = ASAN_SHADOW_SCALE;
145145
if (shadow_offset)
146-
*shadow_offset = SHADOW_OFFSET;
146+
*shadow_offset = ASAN_SHADOW_OFFSET;
147147
}

‎compiler-rt/lib/asan/asan_errors.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ void ErrorBadParamsToAnnotateContiguousContainer::Print() {
329329
" old_mid : %p\n"
330330
" new_mid : %p\n",
331331
(void *)beg, (void *)end, (void *)old_mid, (void *)new_mid);
332-
uptr granularity = SHADOW_GRANULARITY;
332+
uptr granularity = ASAN_SHADOW_GRANULARITY;
333333
if (!IsAligned(beg, granularity))
334334
Report("ERROR: beg is not aligned by %zu\n", granularity);
335335
stack->Print();
@@ -410,7 +410,8 @@ ErrorGeneric::ErrorGeneric(u32 tid, uptr pc_, uptr bp_, uptr sp_, uptr addr,
410410
if (AddrIsInMem(addr)) {
411411
u8 *shadow_addr = (u8 *)MemToShadow(addr);
412412
// If we are accessing 16 bytes, look at the second shadow byte.
413-
if (*shadow_addr == 0 && access_size > SHADOW_GRANULARITY) shadow_addr++;
413+
if (*shadow_addr == 0 && access_size > ASAN_SHADOW_GRANULARITY)
414+
shadow_addr++;
414415
// If we are in the partial right redzone, look at the next shadow byte.
415416
if (*shadow_addr > 0 && *shadow_addr < 128) shadow_addr++;
416417
bool far_from_bounds = false;
@@ -501,10 +502,11 @@ static void PrintLegend(InternalScopedString *str) {
501502
str->append(
502503
"Shadow byte legend (one shadow byte represents %d "
503504
"application bytes):\n",
504-
(int)SHADOW_GRANULARITY);
505+
(int)ASAN_SHADOW_GRANULARITY);
505506
PrintShadowByte(str, " Addressable: ", 0);
506507
str->append(" Partially addressable: ");
507-
for (u8 i = 1; i < SHADOW_GRANULARITY; i++) PrintShadowByte(str, "", i, " ");
508+
for (u8 i = 1; i < ASAN_SHADOW_GRANULARITY; i++)
509+
PrintShadowByte(str, "", i, " ");
508510
str->append("\n");
509511
PrintShadowByte(str, " Heap left redzone: ",
510512
kAsanHeapLeftRedzoneMagic);

‎compiler-rt/lib/asan/asan_fake_stack.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ static const u64 kAllocaRedzoneMask = 31UL;
2828
// For small size classes inline PoisonShadow for better performance.
2929
ALWAYS_INLINE void SetShadow(uptr ptr, uptr size, uptr class_id, u64 magic) {
3030
u64 *shadow = reinterpret_cast<u64*>(MemToShadow(ptr));
31-
if (SHADOW_SCALE == 3 && class_id <= 6) {
32-
// This code expects SHADOW_SCALE=3.
31+
if (ASAN_SHADOW_SCALE == 3 && class_id <= 6) {
32+
// This code expects ASAN_SHADOW_SCALE=3.
3333
for (uptr i = 0; i < (((uptr)1) << class_id); i++) {
3434
shadow[i] = magic;
3535
// Make sure this does not become memset.
@@ -294,18 +294,19 @@ void __asan_alloca_poison(uptr addr, uptr size) {
294294
uptr LeftRedzoneAddr = addr - kAllocaRedzoneSize;
295295
uptr PartialRzAddr = addr + size;
296296
uptr RightRzAddr = (PartialRzAddr + kAllocaRedzoneMask) & ~kAllocaRedzoneMask;
297-
uptr PartialRzAligned = PartialRzAddr & ~(SHADOW_GRANULARITY - 1);
297+
uptr PartialRzAligned = PartialRzAddr & ~(ASAN_SHADOW_GRANULARITY - 1);
298298
FastPoisonShadow(LeftRedzoneAddr, kAllocaRedzoneSize, kAsanAllocaLeftMagic);
299299
FastPoisonShadowPartialRightRedzone(
300-
PartialRzAligned, PartialRzAddr % SHADOW_GRANULARITY,
300+
PartialRzAligned, PartialRzAddr % ASAN_SHADOW_GRANULARITY,
301301
RightRzAddr - PartialRzAligned, kAsanAllocaRightMagic);
302302
FastPoisonShadow(RightRzAddr, kAllocaRedzoneSize, kAsanAllocaRightMagic);
303303
}
304304

305305
SANITIZER_INTERFACE_ATTRIBUTE
306306
void __asan_allocas_unpoison(uptr top, uptr bottom) {
307307
if ((!top) || (top > bottom)) return;
308-
REAL(memset)(reinterpret_cast<void*>(MemToShadow(top)), 0,
309-
(bottom - top) / SHADOW_GRANULARITY);
308+
REAL(memset)
309+
(reinterpret_cast<void *>(MemToShadow(top)), 0,
310+
(bottom - top) / ASAN_SHADOW_GRANULARITY);
310311
}
311312
} // extern "C"

‎compiler-rt/lib/asan/asan_flags.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ void InitializeFlags() {
140140
SanitizerToolName);
141141
Die();
142142
}
143-
// Ensure that redzone is at least SHADOW_GRANULARITY.
144-
if (f->redzone < (int)SHADOW_GRANULARITY)
145-
f->redzone = SHADOW_GRANULARITY;
143+
// Ensure that redzone is at least ASAN_SHADOW_GRANULARITY.
144+
if (f->redzone < (int)ASAN_SHADOW_GRANULARITY)
145+
f->redzone = ASAN_SHADOW_GRANULARITY;
146146
// Make "strict_init_order" imply "check_initialization_order".
147147
// TODO(samsonov): Use a single runtime flag for an init-order checker.
148148
if (f->strict_init_order) {

‎compiler-rt/lib/asan/asan_globals.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,13 @@ ALWAYS_INLINE void PoisonShadowForGlobal(const Global *g, u8 value) {
6161
}
6262

6363
ALWAYS_INLINE void PoisonRedZones(const Global &g) {
64-
uptr aligned_size = RoundUpTo(g.size, SHADOW_GRANULARITY);
64+
uptr aligned_size = RoundUpTo(g.size, ASAN_SHADOW_GRANULARITY);
6565
FastPoisonShadow(g.beg + aligned_size, g.size_with_redzone - aligned_size,
6666
kAsanGlobalRedzoneMagic);
6767
if (g.size != aligned_size) {
6868
FastPoisonShadowPartialRightRedzone(
69-
g.beg + RoundDownTo(g.size, SHADOW_GRANULARITY),
70-
g.size % SHADOW_GRANULARITY,
71-
SHADOW_GRANULARITY,
69+
g.beg + RoundDownTo(g.size, ASAN_SHADOW_GRANULARITY),
70+
g.size % ASAN_SHADOW_GRANULARITY, ASAN_SHADOW_GRANULARITY,
7271
kAsanGlobalRedzoneMagic);
7372
}
7473
}

‎compiler-rt/lib/asan/asan_linux.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ uptr FindDynamicShadowStart() {
107107
return FindPremappedShadowStart(shadow_size_bytes);
108108
#endif
109109

110-
return MapDynamicShadow(shadow_size_bytes, SHADOW_SCALE,
110+
return MapDynamicShadow(shadow_size_bytes, ASAN_SHADOW_SCALE,
111111
/*min_shadow_base_alignment*/ 0, kHighMemEnd);
112112
}
113113

‎compiler-rt/lib/asan/asan_mapping.h

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -151,65 +151,66 @@
151151
// || `[0x30000000, 0x35ffffff]` || LowShadow ||
152152
// || `[0x00000000, 0x2fffffff]` || LowMem ||
153153

154-
#define SHADOW_SCALE 3
154+
#define ASAN_SHADOW_SCALE 3
155155

156156
static const u64 kDefaultShadowSentinel = ~(uptr)0;
157157

158158
#if SANITIZER_FUCHSIA
159-
# define SHADOW_OFFSET_CONST (0)
159+
# define ASAN_SHADOW_OFFSET_CONST (0)
160160
#elif SANITIZER_WORDSIZE == 32
161161
# if SANITIZER_ANDROID
162-
# define SHADOW_OFFSET_DYNAMIC
162+
# define ASAN_SHADOW_OFFSET_DYNAMIC
163163
# elif defined(__mips__)
164-
# define SHADOW_OFFSET_CONST 0x0aaa0000
164+
# define ASAN_SHADOW_OFFSET_CONST 0x0aaa0000
165165
# elif SANITIZER_FREEBSD
166-
# define SHADOW_OFFSET_CONST 0x40000000
166+
# define ASAN_SHADOW_OFFSET_CONST 0x40000000
167167
# elif SANITIZER_NETBSD
168-
# define SHADOW_OFFSET_CONST 0x40000000
168+
# define ASAN_SHADOW_OFFSET_CONST 0x40000000
169169
# elif SANITIZER_WINDOWS
170-
# define SHADOW_OFFSET_CONST 0x30000000
170+
# define ASAN_SHADOW_OFFSET_CONST 0x30000000
171171
# elif SANITIZER_IOS
172-
# define SHADOW_OFFSET_DYNAMIC
172+
# define ASAN_SHADOW_OFFSET_DYNAMIC
173173
# else
174-
# define SHADOW_OFFSET_CONST 0x20000000
174+
# define ASAN_SHADOW_OFFSET_CONST 0x20000000
175175
# endif
176176
#else
177177
# if SANITIZER_IOS
178-
# define SHADOW_OFFSET_DYNAMIC
178+
# define ASAN_SHADOW_OFFSET_DYNAMIC
179179
# elif SANITIZER_MAC && defined(__aarch64__)
180-
# define SHADOW_OFFSET_DYNAMIC
180+
# define ASAN_SHADOW_OFFSET_DYNAMIC
181181
# elif SANITIZER_RISCV64
182-
# define SHADOW_OFFSET_CONST 0x0000000d55550000
182+
# define ASAN_SHADOW_OFFSET_CONST 0x0000000d55550000
183183
# elif defined(__aarch64__)
184-
# define SHADOW_OFFSET_CONST 0x0000001000000000
184+
# define ASAN_SHADOW_OFFSET_CONST 0x0000001000000000
185185
# elif defined(__powerpc64__)
186-
# define SHADOW_OFFSET_CONST 0x0000100000000000
186+
# define ASAN_SHADOW_OFFSET_CONST 0x0000100000000000
187187
# elif defined(__s390x__)
188-
# define SHADOW_OFFSET_CONST 0x0010000000000000
188+
# define ASAN_SHADOW_OFFSET_CONST 0x0010000000000000
189189
# elif SANITIZER_FREEBSD
190-
# define SHADOW_OFFSET_CONST 0x0000400000000000
190+
# define ASAN_SHADOW_OFFSET_CONST 0x0000400000000000
191191
# elif SANITIZER_NETBSD
192-
# define SHADOW_OFFSET_CONST 0x0000400000000000
192+
# define ASAN_SHADOW_OFFSET_CONST 0x0000400000000000
193193
# elif SANITIZER_MAC
194-
# define SHADOW_OFFSET_CONST 0x0000100000000000
194+
# define ASAN_SHADOW_OFFSET_CONST 0x0000100000000000
195195
# elif defined(__mips64)
196-
# define SHADOW_OFFSET_CONST 0x0000002000000000
196+
# define ASAN_SHADOW_OFFSET_CONST 0x0000002000000000
197197
# elif defined(__sparc__)
198-
# define SHADOW_OFFSET_CONST 0x0000080000000000
198+
# define ASAN_SHADOW_OFFSET_CONST 0x0000080000000000
199199
# elif SANITIZER_WINDOWS64
200-
# define SHADOW_OFFSET_DYNAMIC
200+
# define ASAN_SHADOW_OFFSET_DYNAMIC
201201
# else
202-
# define SHADOW_OFFSET_CONST 0x000000007FFFFFFF & (~0xFFFULL << SHADOW_SCALE)
202+
# define ASAN_SHADOW_OFFSET_CONST \
203+
0x000000007FFFFFFF & (~0xFFFULL << ASAN_SHADOW_SCALE)
203204
# endif
204205
#endif
205206

206-
#if defined(SHADOW_OFFSET_CONST)
207-
static const u64 kConstShadowOffset = SHADOW_OFFSET_CONST;
208-
# define SHADOW_OFFSET kConstShadowOffset
209-
#elif defined(SHADOW_OFFSET_DYNAMIC)
210-
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address
207+
#if defined(ASAN_SHADOW_OFFSET_CONST)
208+
static const u64 kConstShadowOffset = ASAN_SHADOW_OFFSET_CONST;
209+
# define ASAN_SHADOW_OFFSET kConstShadowOffset
210+
#elif defined(ASAN_SHADOW_OFFSET_DYNAMIC)
211+
# define ASAN_SHADOW_OFFSET __asan_shadow_memory_dynamic_address
211212
#else
212-
# error "SHADOW_OFFSET can't be determined."
213+
# error "ASAN_SHADOW_OFFSET can't be determined."
213214
#endif
214215

215216
#if SANITIZER_ANDROID && defined(__arm__)
@@ -218,7 +219,7 @@ static const u64 kConstShadowOffset = SHADOW_OFFSET_CONST;
218219
# define ASAN_PREMAP_SHADOW 0
219220
#endif
220221

221-
#define SHADOW_GRANULARITY (1ULL << SHADOW_SCALE)
222+
#define ASAN_SHADOW_GRANULARITY (1ULL << ASAN_SHADOW_SCALE)
222223

223224
#define DO_ASAN_MAPPING_PROFILE 0 // Set to 1 to profile the functions below.
224225

@@ -252,36 +253,37 @@ extern uptr kHighMemEnd, kMidMemBeg, kMidMemEnd; // Initialized in __asan_init.
252253
#if defined(__sparc__) && SANITIZER_WORDSIZE == 64
253254
# include "asan_mapping_sparc64.h"
254255
#else
255-
#define MEM_TO_SHADOW(mem) (((mem) >> SHADOW_SCALE) + (SHADOW_OFFSET))
256+
# define MEM_TO_SHADOW(mem) \
257+
(((mem) >> ASAN_SHADOW_SCALE) + (ASAN_SHADOW_OFFSET))
256258

257-
#define kLowMemBeg 0
258-
#define kLowMemEnd (SHADOW_OFFSET ? SHADOW_OFFSET - 1 : 0)
259+
# define kLowMemBeg 0
260+
# define kLowMemEnd (ASAN_SHADOW_OFFSET ? ASAN_SHADOW_OFFSET - 1 : 0)
259261

260-
#define kLowShadowBeg SHADOW_OFFSET
261-
#define kLowShadowEnd MEM_TO_SHADOW(kLowMemEnd)
262+
# define kLowShadowBeg ASAN_SHADOW_OFFSET
263+
# define kLowShadowEnd MEM_TO_SHADOW(kLowMemEnd)
262264

263-
#define kHighMemBeg (MEM_TO_SHADOW(kHighMemEnd) + 1)
265+
# define kHighMemBeg (MEM_TO_SHADOW(kHighMemEnd) + 1)
264266

265-
#define kHighShadowBeg MEM_TO_SHADOW(kHighMemBeg)
266-
#define kHighShadowEnd MEM_TO_SHADOW(kHighMemEnd)
267+
# define kHighShadowBeg MEM_TO_SHADOW(kHighMemBeg)
268+
# define kHighShadowEnd MEM_TO_SHADOW(kHighMemEnd)
267269

268-
# define kMidShadowBeg MEM_TO_SHADOW(kMidMemBeg)
269-
# define kMidShadowEnd MEM_TO_SHADOW(kMidMemEnd)
270+
# define kMidShadowBeg MEM_TO_SHADOW(kMidMemBeg)
271+
# define kMidShadowEnd MEM_TO_SHADOW(kMidMemEnd)
270272

271273
// With the zero shadow base we can not actually map pages starting from 0.
272274
// This constant is somewhat arbitrary.
273-
#define kZeroBaseShadowStart 0
274-
#define kZeroBaseMaxShadowStart (1 << 18)
275+
# define kZeroBaseShadowStart 0
276+
# define kZeroBaseMaxShadowStart (1 << 18)
275277

276-
#define kShadowGapBeg (kLowShadowEnd ? kLowShadowEnd + 1 \
277-
: kZeroBaseShadowStart)
278-
#define kShadowGapEnd ((kMidMemBeg ? kMidShadowBeg : kHighShadowBeg) - 1)
278+
# define kShadowGapBeg \
279+
(kLowShadowEnd ? kLowShadowEnd + 1 : kZeroBaseShadowStart)
280+
# define kShadowGapEnd ((kMidMemBeg ? kMidShadowBeg : kHighShadowBeg) - 1)
279281

280-
#define kShadowGap2Beg (kMidMemBeg ? kMidShadowEnd + 1 : 0)
281-
#define kShadowGap2End (kMidMemBeg ? kMidMemBeg - 1 : 0)
282+
# define kShadowGap2Beg (kMidMemBeg ? kMidShadowEnd + 1 : 0)
283+
# define kShadowGap2End (kMidMemBeg ? kMidMemBeg - 1 : 0)
282284

283-
#define kShadowGap3Beg (kMidMemBeg ? kMidMemEnd + 1 : 0)
284-
#define kShadowGap3End (kMidMemBeg ? kHighShadowBeg - 1 : 0)
285+
# define kShadowGap3Beg (kMidMemBeg ? kMidMemEnd + 1 : 0)
286+
# define kShadowGap3End (kMidMemBeg ? kHighShadowBeg - 1 : 0)
285287

286288
namespace __asan {
287289

@@ -319,13 +321,13 @@ static inline bool AddrIsInShadowGap(uptr a) {
319321
PROFILE_ASAN_MAPPING();
320322
if (kMidMemBeg) {
321323
if (a <= kShadowGapEnd)
322-
return SHADOW_OFFSET == 0 || a >= kShadowGapBeg;
324+
return ASAN_SHADOW_OFFSET == 0 || a >= kShadowGapBeg;
323325
return (a >= kShadowGap2Beg && a <= kShadowGap2End) ||
324326
(a >= kShadowGap3Beg && a <= kShadowGap3End);
325327
}
326328
// In zero-based shadow mode we treat addresses near zero as addresses
327329
// in shadow gap as well.
328-
if (SHADOW_OFFSET == 0)
330+
if (ASAN_SHADOW_OFFSET == 0)
329331
return a <= kShadowGapEnd;
330332
return a >= kShadowGapBeg && a <= kShadowGapEnd;
331333
}
@@ -336,7 +338,9 @@ static inline bool AddrIsInShadowGap(uptr a) {
336338

337339
namespace __asan {
338340

339-
static inline uptr MemToShadowSize(uptr size) { return size >> SHADOW_SCALE; }
341+
static inline uptr MemToShadowSize(uptr size) {
342+
return size >> ASAN_SHADOW_SCALE;
343+
}
340344

341345
static inline bool AddrIsInMem(uptr a) {
342346
PROFILE_ASAN_MAPPING();
@@ -357,7 +361,7 @@ static inline bool AddrIsInShadow(uptr a) {
357361

358362
static inline bool AddrIsAlignedByGranularity(uptr a) {
359363
PROFILE_ASAN_MAPPING();
360-
return (a & (SHADOW_GRANULARITY - 1)) == 0;
364+
return (a & (ASAN_SHADOW_GRANULARITY - 1)) == 0;
361365
}
362366

363367
static inline bool AddressIsPoisoned(uptr a) {
@@ -366,8 +370,8 @@ static inline bool AddressIsPoisoned(uptr a) {
366370
u8 *shadow_address = (u8*)MEM_TO_SHADOW(a);
367371
s8 shadow_value = *shadow_address;
368372
if (shadow_value) {
369-
u8 last_accessed_byte = (a & (SHADOW_GRANULARITY - 1))
370-
+ kAccessSize - 1;
373+
u8 last_accessed_byte =
374+
(a & (ASAN_SHADOW_GRANULARITY - 1)) + kAccessSize - 1;
371375
return (last_accessed_byte >= shadow_value);
372376
}
373377
return false;

0 commit comments

Comments
 (0)