summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2014-09-04 20:47:27 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2014-09-04 20:47:27 +0000
commitf537aeaea123d9a0258e95e91ae3d07c723ad26f (patch)
tree7ad5879149d382d24ee8684da49692ce932ddb99
parentc2e09253bddd5536ea2788d139cba5e755fbbac5 (diff)
downloadbcm5719-llvm-f537aeaea123d9a0258e95e91ae3d07c723ad26f.tar.gz
bcm5719-llvm-f537aeaea123d9a0258e95e91ae3d07c723ad26f.zip
[ASan] Remove the call to GetPageSizeCached from fast path of FastPoisonShadow
llvm-svn: 217194
-rw-r--r--compiler-rt/lib/asan/asan_poisoning.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/lib/asan/asan_poisoning.h b/compiler-rt/lib/asan/asan_poisoning.h
index bd680ae94fb..feda1a98454 100644
--- a/compiler-rt/lib/asan/asan_poisoning.h
+++ b/compiler-rt/lib/asan/asan_poisoning.h
@@ -35,7 +35,6 @@ void PoisonShadowPartialRightRedzone(uptr addr,
ALWAYS_INLINE void FastPoisonShadow(uptr aligned_beg, uptr aligned_size,
u8 value) {
DCHECK(flags()->poison_heap);
- uptr PageSize = GetPageSizeCached();
uptr shadow_beg = MEM_TO_SHADOW(aligned_beg);
uptr shadow_end = MEM_TO_SHADOW(
aligned_beg + aligned_size - SHADOW_GRANULARITY) + 1;
@@ -48,8 +47,9 @@ ALWAYS_INLINE void FastPoisonShadow(uptr aligned_beg, uptr aligned_size,
shadow_end - shadow_beg < common_flags()->clear_shadow_mmap_threshold) {
REAL(memset)((void*)shadow_beg, value, shadow_end - shadow_beg);
} else {
- uptr page_beg = RoundUpTo(shadow_beg, PageSize);
- uptr page_end = RoundDownTo(shadow_end, PageSize);
+ uptr page_size = GetPageSizeCached();
+ uptr page_beg = RoundUpTo(shadow_beg, page_size);
+ uptr page_end = RoundDownTo(shadow_end, page_size);
if (page_beg >= page_end) {
REAL(memset)((void *)shadow_beg, 0, shadow_end - shadow_beg);
OpenPOWER on IntegriCloud