mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 17:29:19 +00:00
Revert of r212265.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212266 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
7b605fc44d
commit
7bf5a63e11
@ -511,7 +511,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
// The following flags disable parts of MSan instrumentation based on
|
||||
// blacklist contents and command-line options.
|
||||
bool InsertChecks;
|
||||
bool PropagateShadow;
|
||||
bool LoadShadow;
|
||||
bool PoisonStack;
|
||||
bool PoisonUndef;
|
||||
bool CheckReturnValue;
|
||||
@ -532,7 +532,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
bool SanitizeFunction = F.getAttributes().hasAttribute(
|
||||
AttributeSet::FunctionIndex, Attribute::SanitizeMemory);
|
||||
InsertChecks = SanitizeFunction;
|
||||
PropagateShadow = SanitizeFunction;
|
||||
LoadShadow = SanitizeFunction;
|
||||
PoisonStack = SanitizeFunction && ClPoisonStack;
|
||||
PoisonUndef = SanitizeFunction && ClPoisonUndef;
|
||||
// FIXME: Consider using SpecialCaseList to specify a list of functions that
|
||||
@ -716,14 +716,13 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
|
||||
// Finalize PHI nodes.
|
||||
for (PHINode *PN : ShadowPHINodes) {
|
||||
Value *S = getShadow(PN);
|
||||
if (isa<Constant>(S)) continue;
|
||||
PHINode *PNS = cast<PHINode>(getShadow(PN));
|
||||
PHINode *PNO = MS.TrackOrigins ? cast<PHINode>(getOrigin(PN)) : nullptr;
|
||||
size_t NumValues = PN->getNumIncomingValues();
|
||||
for (size_t v = 0; v < NumValues; v++) {
|
||||
PNS->addIncoming(getShadow(PN, v), PN->getIncomingBlock(v));
|
||||
if (PNO) PNO->addIncoming(getOrigin(PN, v), PN->getIncomingBlock(v));
|
||||
if (PNO)
|
||||
PNO->addIncoming(getOrigin(PN, v), PN->getIncomingBlock(v));
|
||||
}
|
||||
}
|
||||
|
||||
@ -857,7 +856,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
/// \brief Set SV to be the shadow value for V.
|
||||
void setShadow(Value *V, Value *SV) {
|
||||
assert(!ShadowMap.count(V) && "Values may only have one shadow");
|
||||
ShadowMap[V] = PropagateShadow ? SV : getCleanShadow(V);
|
||||
ShadowMap[V] = SV;
|
||||
}
|
||||
|
||||
/// \brief Set Origin to be the origin value for V.
|
||||
@ -909,7 +908,6 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
/// This function either returns the value set earlier with setShadow,
|
||||
/// or extracts if from ParamTLS (for function arguments).
|
||||
Value *getShadow(Value *V) {
|
||||
if (!PropagateShadow) return getCleanShadow(V);
|
||||
if (Instruction *I = dyn_cast<Instruction>(V)) {
|
||||
// For instructions the shadow is already stored in the map.
|
||||
Value *Shadow = ShadowMap[V];
|
||||
@ -1077,7 +1075,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
IRBuilder<> IRB(I.getNextNode());
|
||||
Type *ShadowTy = getShadowTy(&I);
|
||||
Value *Addr = I.getPointerOperand();
|
||||
if (PropagateShadow) {
|
||||
if (LoadShadow) {
|
||||
Value *ShadowPtr = getShadowPtr(Addr, ShadowTy, IRB);
|
||||
setShadow(&I,
|
||||
IRB.CreateAlignedLoad(ShadowPtr, I.getAlignment(), "_msld"));
|
||||
@ -1092,7 +1090,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
I.setOrdering(addAcquireOrdering(I.getOrdering()));
|
||||
|
||||
if (MS.TrackOrigins) {
|
||||
if (PropagateShadow) {
|
||||
if (LoadShadow) {
|
||||
unsigned Alignment = std::max(kMinOriginAlignment, I.getAlignment());
|
||||
setOrigin(&I,
|
||||
IRB.CreateAlignedLoad(getOriginPtr(Addr, IRB), Alignment));
|
||||
@ -1759,7 +1757,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
Value *Addr = I.getArgOperand(0);
|
||||
|
||||
Type *ShadowTy = getShadowTy(&I);
|
||||
if (PropagateShadow) {
|
||||
if (LoadShadow) {
|
||||
Value *ShadowPtr = getShadowPtr(Addr, ShadowTy, IRB);
|
||||
// We don't know the pointer alignment (could be unaligned SSE load!).
|
||||
// Have to assume to worst case.
|
||||
@ -1772,7 +1770,7 @@ struct MemorySanitizerVisitor : public InstVisitor<MemorySanitizerVisitor> {
|
||||
insertShadowCheck(Addr, &I);
|
||||
|
||||
if (MS.TrackOrigins) {
|
||||
if (PropagateShadow)
|
||||
if (LoadShadow)
|
||||
setOrigin(&I, IRB.CreateLoad(getOriginPtr(Addr, IRB)));
|
||||
else
|
||||
setOrigin(&I, getCleanOrigin());
|
||||
|
Loading…
Reference in New Issue
Block a user