Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[hwasan] Allow stack traces even when fixed shadow is used #109344

Closed
wants to merge 6 commits into from
Closed

[hwasan] Allow stack traces even when fixed shadow is used #109344

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
934770d
[hwasan] Allow stack traces even when fixed shadow is used
thurstond Sep 19, 2024
e3526e3
clang-format
thurstond Sep 19, 2024
ad9acd0
Use optOr per Florian1
thurstond Sep 19, 2024
ede736e
Avoid cast
thurstond Sep 20, 2024
22a7612
clang-format
thurstond Sep 20, 2024
dbc05f5
Use uint64_t to (hopefully) avoid compiler warning
thurstond Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,7 +1340,7 @@ Value *HWAddressSanitizer::getFrameRecordInfo(IRBuilder<> &IRB) {
}

void HWAddressSanitizer::emitPrologue(IRBuilder<> &IRB, bool WithFrameRecord) {
if (!Mapping.InTls)
if (!Mapping.InTls || (Mapping.Offset != 0 && Mapping.Offset != kDynamicShadowSentinel))
ShadowBase = getShadowNonTls(IRB);
else if (!WithFrameRecord && TargetTriple.isAndroid())
ShadowBase = getDynamicShadowIfunc(IRB);
Expand Down Expand Up @@ -1897,16 +1897,19 @@ void HWAddressSanitizer::ShadowMapping::init(Triple &TargetTriple,
InTls = false;
Offset = 0;
WithFrameRecord = true;
} else if (ClMappingOffset.getNumOccurrences() > 0) {
InGlobal = false;
InTls = false;
Offset = ClMappingOffset;
WithFrameRecord = false;
} else if (ClEnableKhwasan || InstrumentWithCalls) {
InGlobal = false;
InTls = false;
Offset = 0;
if (ClMappingOffset.getNumOccurrences() > 0)
fmayer marked this conversation as resolved.
Show resolved Hide resolved
Offset = ClMappingOffset;
else
Offset = 0;
WithFrameRecord = false;
} else if (ClMappingOffset.getNumOccurrences() > 0) {
InGlobal = false;
InTls = true;
Offset = ClMappingOffset;
WithFrameRecord = true;
} else if (ClWithIfunc) {
InGlobal = true;
InTls = false;
Expand Down
Loading