maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[gardening] Replace some uses of setDebugLoc(DebugLoc()) with dropLocation(), NFC" 

Some of the buildbots have croaked with this patch, for examples failures
that begin in this build:

  http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/29933

This reverts commit 674f57870f.
This commit is contained in:
Jeremy Morse 2020-09-30 09:43:29 +01:00
parent 0767a0b53e
commit 05659606a2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Transforms/Scalar/LICM.cpp
View File

@ -2159,7 +2159,7 @@ bool llvm::promoteLoopAccessesToScalars(
if (SawUnorderedAtomic)
PreheaderLoad->setOrdering(AtomicOrdering::Unordered);
PreheaderLoad->setAlignment(Alignment);
PreheaderLoad->dropLocation();
PreheaderLoad->setDebugLoc(DebugLoc());
if (AATags)
PreheaderLoad->setAAMetadata(AATags);
SSA.AddAvailableValue(Preheader, PreheaderLoad);

6
llvm/lib/Transforms/Utils/SimplifyCFG.cpp
View File

@ -2218,7 +2218,7 @@ bool SimplifyCFGOpt::SpeculativelyExecuteBB(BranchInst *BI, BasicBlock *ThenBB,
// be misleading while debugging.
for (auto &I : *ThenBB) {
if (!SpeculatedStoreValue || &I != SpeculatedStore)
I.dropLocation();
I.setDebugLoc(DebugLoc());
I.dropUnknownNonDebugMetadata();
}
@ -2878,7 +2878,7 @@ bool llvm::FoldBranchToCommonDest(BranchInst *BI, MemorySSAUpdater *MSSAU,
// When we fold the bonus instructions we want to make sure we
// reset their debug locations in order to avoid stepping on dead
// code caused by folding dead branches.
NewBonusInst->dropLocation();
NewBonusInst->setDebugLoc(DebugLoc());
RemapInstruction(NewBonusInst, VMap,
RF_NoModuleLevelChanges | RF_IgnoreMissingLocals);
@ -2902,7 +2902,7 @@ bool llvm::FoldBranchToCommonDest(BranchInst *BI, MemorySSAUpdater *MSSAU,
// Reset the condition debug location to avoid jumping on dead code
// as the result of folding dead branches.
CondInPred->dropLocation();
CondInPred->setDebugLoc(DebugLoc());
RemapInstruction(CondInPred, VMap,
RF_NoModuleLevelChanges | RF_IgnoreMissingLocals);