This is an archive of the discontinued LLVM Phabricator instance.

Differential D115213

[ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST.
ClosedPublic

Authored by kstoimenov on Dec 6 2021, 7:20 PM.

Details

Reviewers
vitalybuka
Commits
rG591eb2bdb66b: [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST.

Diff Detail

Event Timeline

kstoimenov created this revision.Dec 6 2021, 7:20 PM
Herald added subscribers: luke957, s.egerton, simoncook, fedor.sergeev. · View Herald TranscriptDec 6 2021, 7:20 PM
kstoimenov requested review of this revision.Dec 6 2021, 7:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2021, 7:20 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
kstoimenov retitled this revision from [ASan] Refactored SHADOW_OFFSET implementation. to [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST. .Dec 6 2021, 7:21 PM
kstoimenov added a reviewer: vitalybuka.
kstoimenov added a child revision: D115214: [ASan] Replaced constants for SHADOW_OFFSET with defines..
vitalybuka added a comment.Dec 6 2021, 7:31 PM

I guess instead of skipping cases you need to have an empty branch

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

SANITIZER_ANDROID before

195

SANITIZER_ANDROID after

Harbormaster completed remote builds in B137806: Diff 392260.Dec 6 2021, 7:46 PM
kstoimenov updated this revision to Diff 392267.Dec 6 2021, 7:47 PM
kstoimenov retitled this revision from [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST. to [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST..

Added back some ifs.

vitalybuka accepted this revision.Dec 6 2021, 7:50 PM

Mayby this was the reason and we missed some if before revert

This revision is now accepted and ready to land.Dec 6 2021, 7:50 PM
kstoimenov updated this revision to Diff 392268.Dec 6 2021, 7:51 PM

Renames.

kstoimenov marked 2 inline comments as done.Dec 6 2021, 7:52 PM

Good catch. I think this is what tripping it over before.

Harbormaster completed remote builds in B137811: Diff 392268.Dec 6 2021, 8:10 PM
kstoimenov updated this revision to Diff 392384.Dec 7 2021, 6:53 AM

Added SHADOW_OFFSET_DYNAMIC.

kstoimenov updated this revision to Diff 392386.Dec 7 2021, 6:55 AM

Missed 2 spots.

kstoimenov added a comment.Dec 7 2021, 6:58 AM

Added SHADOW_OFFSET_DYNAMIC, PTAL.

Harbormaster completed remote builds in B137901: Diff 392386.Dec 7 2021, 7:13 AM
kstoimenov updated this revision to Diff 392440.Dec 7 2021, 9:39 AM

After rebase.

This revision was landed with ongoing or failed builds.Dec 7 2021, 9:53 AM
Closed by commit rG591eb2bdb66b: [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST. (authored by kstoimenov). · Explain Why
This revision was automatically updated to reflect the committed changes.
kstoimenov added a commit: rG591eb2bdb66b: [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST..
Harbormaster completed remote builds in B137936: Diff 392440.Dec 7 2021, 10:09 AM
kstoimenov removed a child revision: D115214: [ASan] Replaced constants for SHADOW_OFFSET with defines..Dec 7 2021, 10:14 AM

Revision Contents

PathSize
compiler-rt/
lib/
asan/
48 lines

Diff 392447

compiler-rt/lib/asan/asan_mapping.h

Show First 20 Lines • Show All 171 Lines • ▼ Show 20 Lines
static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000
static const u64 kNetBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000 static const u64 kNetBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000
static const u64 kNetBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000 static const u64 kNetBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000
static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000 static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000
#define SHADOW_SCALE kDefaultShadowScale #define SHADOW_SCALE kDefaultShadowScale
#if SANITIZER_FUCHSIA #if SANITIZER_FUCHSIA
# define SHADOW_OFFSET (0) # define SHADOW_OFFSET_CONST (0)
#elif SANITIZER_WORDSIZE == 32 #elif SANITIZER_WORDSIZE == 32
# if SANITIZER_ANDROID # if SANITIZER_ANDROID
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # define SHADOW_OFFSET_DYNAMIC
vitalybukaUnsubmitted
Done
ReplyInline Actions

SANITIZER_ANDROID before

vitalybuka: SANITIZER_ANDROID before
# elif defined(__mips__) # elif defined(__mips__)
# define SHADOW_OFFSET kMIPS32_ShadowOffset32 # define SHADOW_OFFSET_CONST kMIPS32_ShadowOffset32
# elif SANITIZER_FREEBSD # elif SANITIZER_FREEBSD
# define SHADOW_OFFSET kFreeBSD_ShadowOffset32 # define SHADOW_OFFSET_CONST kFreeBSD_ShadowOffset32
# elif SANITIZER_NETBSD # elif SANITIZER_NETBSD
# define SHADOW_OFFSET kNetBSD_ShadowOffset32 # define SHADOW_OFFSET_CONST kNetBSD_ShadowOffset32
# elif SANITIZER_WINDOWS # elif SANITIZER_WINDOWS
# define SHADOW_OFFSET kWindowsShadowOffset32 # define SHADOW_OFFSET_CONST kWindowsShadowOffset32
# elif SANITIZER_IOS # elif SANITIZER_IOS
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # define SHADOW_OFFSET_DYNAMIC
# else # else
# define SHADOW_OFFSET kDefaultShadowOffset32 # define SHADOW_OFFSET_CONST kDefaultShadowOffset32
vitalybukaUnsubmitted
Done
ReplyInline Actions

SANITIZER_ANDROID after

vitalybuka: SANITIZER_ANDROID after
# endif # endif
#else #else
# if SANITIZER_IOS # if SANITIZER_IOS
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # define SHADOW_OFFSET_DYNAMIC
# elif SANITIZER_MAC && defined(__aarch64__) # elif SANITIZER_MAC && defined(__aarch64__)
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # define SHADOW_OFFSET_DYNAMIC
# elif SANITIZER_RISCV64 # elif SANITIZER_RISCV64
# define SHADOW_OFFSET kRiscv64_ShadowOffset64 # define SHADOW_OFFSET_CONST kRiscv64_ShadowOffset64
# elif defined(__aarch64__) # elif defined(__aarch64__)
# define SHADOW_OFFSET kAArch64_ShadowOffset64 # define SHADOW_OFFSET_CONST kAArch64_ShadowOffset64
# elif defined(__powerpc64__) # elif defined(__powerpc64__)
# define SHADOW_OFFSET kPPC64_ShadowOffset64 # define SHADOW_OFFSET_CONST kPPC64_ShadowOffset64
# elif defined(__s390x__) # elif defined(__s390x__)
# define SHADOW_OFFSET kSystemZ_ShadowOffset64 # define SHADOW_OFFSET_CONST kSystemZ_ShadowOffset64
# elif SANITIZER_FREEBSD # elif SANITIZER_FREEBSD
# define SHADOW_OFFSET kFreeBSD_ShadowOffset64 # define SHADOW_OFFSET_CONST kFreeBSD_ShadowOffset64
# elif SANITIZER_NETBSD # elif SANITIZER_NETBSD
# define SHADOW_OFFSET kNetBSD_ShadowOffset64 # define SHADOW_OFFSET_CONST kNetBSD_ShadowOffset64
# elif SANITIZER_MAC # elif SANITIZER_MAC
# define SHADOW_OFFSET kDefaultShadowOffset64 # define SHADOW_OFFSET_CONST kDefaultShadowOffset64
# elif defined(__mips64) # elif defined(__mips64)
# define SHADOW_OFFSET kMIPS64_ShadowOffset64 # define SHADOW_OFFSET_CONST kMIPS64_ShadowOffset64
# elif defined(__sparc__) # elif defined(__sparc__)
# define SHADOW_OFFSET kSPARC64_ShadowOffset64 # define SHADOW_OFFSET_CONST kSPARC64_ShadowOffset64
# elif SANITIZER_WINDOWS64 # elif SANITIZER_WINDOWS64
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # define SHADOW_OFFSET_DYNAMIC
# else # else
# define SHADOW_OFFSET kDefaultShort64bitShadowOffset # define SHADOW_OFFSET_CONST kDefaultShort64bitShadowOffset
# endif
# endif #endif
#if defined(SHADOW_OFFSET_CONST)
# define SHADOW_OFFSET SHADOW_OFFSET_CONST
#elif defined(SHADOW_OFFSET_DYNAMIC)
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address
#endif #endif
#if SANITIZER_ANDROID && defined(__arm__) #if SANITIZER_ANDROID && defined(__arm__)
# define ASAN_PREMAP_SHADOW 1 # define ASAN_PREMAP_SHADOW 1
#else #else
# define ASAN_PREMAP_SHADOW 0 # define ASAN_PREMAP_SHADOW 0
#endif #endif
▲ Show 20 Lines • Show All 161 Lines • Show Last 20 Lines