This is an archive of the discontinued LLVM Phabricator instance.

Differential D128672

Update DynInit generation for ASan globals.
ClosedPublic

Authored by hctim on Jun 27 2022, 10:43 AM.

Details

Reviewers
vitalybuka
Commits
rGf18de7619e5d: Update DynInit generation for ASan globals.
Summary

Address a follow-up TODO for Sanitizer Metadata.

Diff Detail

Event Timeline

hctim created this revision.Jun 27 2022, 10:43 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 27 2022, 10:43 AM
hctim requested review of this revision.Jun 27 2022, 10:43 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 27 2022, 10:43 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript
hctim added a parent revision: D127911: Delete 'llvm.asan.globals' for global metadata..Jun 27 2022, 10:43 AM
Harbormaster completed remote builds in B172260: Diff 440309.Jun 27 2022, 10:44 AM
hctim mentioned this in D127911: Delete 'llvm.asan.globals' for global metadata..Jun 27 2022, 10:44 AM
vitalybuka accepted this revision.Jul 11 2022, 11:37 AM
vitalybuka added inline comments.
clang/lib/CodeGen/SanitizerMetadata.cpp
67–72

maybe a little bit nicer

This revision is now accepted and ready to land.Jul 11 2022, 11:37 AM
hctim updated this revision to Diff 443702.Jul 11 2022, 11:44 AM
hctim marked an inline comment as done.

Integrate Vitaly's suggestion.

Harbormaster completed remote builds in B174710: Diff 443702.Jul 11 2022, 12:19 PM
Closed by commit rGf18de7619e5d: Update DynInit generation for ASan globals. (authored by hctim). · Explain WhyJul 11 2022, 12:24 PM
This revision was automatically updated to reflect the committed changes.
hctim added a commit: rGf18de7619e5d: Update DynInit generation for ASan globals..

Revision Contents

PathSize
clang/
lib/
CodeGen/
12 lines

Diff 443717

clang/lib/CodeGen/SanitizerMetadata.cpp

Show First 20 Lines • Show All 58 Lines • ▼ Show 20 Linesvoid SanitizerMetadata::reportGlobal(llvm::GlobalVariable *GV,
Meta.NoHWAddress |= NoSanitizeAttrSet.hasOneOf(SanitizerKind::HWAddress); Meta.NoHWAddress |= NoSanitizeAttrSet.hasOneOf(SanitizerKind::HWAddress);
Meta.NoHWAddress |= CGM.isInNoSanitizeList( Meta.NoHWAddress |= CGM.isInNoSanitizeList(
FsanitizeArgument.Mask & SanitizerKind::HWAddress, GV, Loc, Ty); FsanitizeArgument.Mask & SanitizerKind::HWAddress, GV, Loc, Ty);
Meta.NoMemtag |= NoSanitizeAttrSet.hasOneOf(SanitizerKind::MemTag); Meta.NoMemtag |= NoSanitizeAttrSet.hasOneOf(SanitizerKind::MemTag);
Meta.NoMemtag |= CGM.isInNoSanitizeList( Meta.NoMemtag |= CGM.isInNoSanitizeList(
FsanitizeArgument.Mask & SanitizerKind::MemTag, GV, Loc, Ty); FsanitizeArgument.Mask & SanitizerKind::MemTag, GV, Loc, Ty);
if (FsanitizeArgument.has(SanitizerKind::Address)) { Meta.IsDynInit = IsDynInit && !Meta.NoAddress &&
// TODO(hctim): Make this conditional when we migrate off llvm.asan.globals. FsanitizeArgument.has(SanitizerKind::Address) &&
IsDynInit &= !CGM.isInNoSanitizeList(SanitizerKind::Address | !CGM.isInNoSanitizeList(SanitizerKind::Address |
SanitizerKind::KernelAddress, SanitizerKind::KernelAddress,
GV, Loc, Ty, "init"); GV, Loc, Ty, "init");
Meta.IsDynInit = IsDynInit;
}
vitalybukaUnsubmitted
Done
ReplyInline Actions
FsanitizeArgument.Mask & SanitizerKind::MemTag, GV, Loc, Ty);
- Meta.IsDynInit = FsanitizeArgument.has(SanitizerKind::Address) && IsDynInit &&
- !Meta.NoAddress &&
+ Meta.IsDynInit = IsDynInit && !Meta.NoAddress &&
+ FsanitizeArgument.has(SanitizerKind::Address) &&
!CGM.isInNoSanitizeList(SanitizerKind::Address |

maybe a little bit nicer

vitalybuka: maybe a little bit nicer
GV->setSanitizerMetadata(Meta); GV->setSanitizerMetadata(Meta);
} }
void SanitizerMetadata::reportGlobal(llvm::GlobalVariable *GV, const VarDecl &D, void SanitizerMetadata::reportGlobal(llvm::GlobalVariable *GV, const VarDecl &D,
bool IsDynInit) { bool IsDynInit) {
if (!isAsanHwasanOrMemTag(CGM.getLangOpts().Sanitize)) if (!isAsanHwasanOrMemTag(CGM.getLangOpts().Sanitize))
return; return;
std::string QualName; std::string QualName;
Show All 26 Lines