6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-20 16:17:38 +00:00
Code Issues Projects Releases Wiki Activity

Revert r224739: Debug info: Teach SROA how to update debug info for

Browse Source 
fragmented variables.

This caused codegen to start crashing when we built somewhat large
programs with debug info and optimizations. 'check-msan' hit in, and
I suspect a bootstrap would as well. I mailed a test case to the
review thread.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224750 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth
2014-12-23 02:58:14 +00:00
parent 860122b3b7
commit d4510005df
4 changed files with 5 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Transforms/Scalar/SROA.cpp
+1 -30
View File
@@ -1220,10 +1220,6 @@ class SROA : public FunctionPass {
/// currently in the promotable queue.
SetVector<SelectInst *, SmallVector<SelectInst *, 2>> SpeculatableSelects;
/// Debug intrinsics do not show up as regular uses in the
/// IR. This side-table holds the missing use edges.
DenseMap<AllocaInst *, DbgDeclareInst *> DbgDeclares;
public:
SROA(bool RequiresDomTree = true)
: FunctionPass(ID), RequiresDomTree(RequiresDomTree), C(nullptr),
@@ -3497,27 +3493,6 @@ bool SROA::rewritePartition(AllocaInst &AI, AllocaSlices &AS,
SliceTy, nullptr, Alignment,
AI.getName() + ".sroa." + Twine(P.begin() - AS.begin()), &AI);
++NumNewAllocas;
// Migrate debug information from the old alloca to the new alloca
// and the individial slices.
if (DbgDeclareInst *DbgDecl = DbgDeclares.lookup(&AI)) {
DIVariable Var(DbgDecl->getVariable());
DIExpression Piece;
DIBuilder DIB(*AI.getParent()->getParent()->getParent(),
/*AllowUnresolved*/ false);
// Create a piece expression describing the slice, if the new slize is
// smaller than the old alloca or the old alloca already was described
// with a piece. It would be even better to just compare against the size
// of the type described in the debug info, but then we would need to
// build an expensive DIRefMap.
if (P.size() < DL->getTypeAllocSize(AI.getAllocatedType()) ||
DIExpression(DbgDecl->getExpression()).isVariablePiece())
Piece = DIB.createPieceExpression(P.beginOffset(), P.size());
Instruction *NewDDI = DIB.insertDeclare(NewAI, Var, Piece, &AI);
NewDDI->setDebugLoc(DbgDecl->getDebugLoc());
DbgDeclares.insert(std::make_pair(NewAI, cast<DbgDeclareInst>(NewDDI)));
DeadInsts.insert(DbgDecl);
}
}
DEBUG(dbgs() << "Rewriting alloca partition "
@@ -3851,13 +3826,9 @@ bool SROA::runOnFunction(Function &F) {
BasicBlock &EntryBB = F.getEntryBlock();
for (BasicBlock::iterator I = EntryBB.begin(), E = std::prev(EntryBB.end());
I != E; ++I) {
I != E; ++I)
if (AllocaInst *AI = dyn_cast<AllocaInst>(I))
Worklist.insert(AI);
else if (DbgDeclareInst *DDI = dyn_cast<DbgDeclareInst>(I))
if (auto AI = dyn_cast_or_null<AllocaInst>(DDI->getAddress()))
DbgDeclares.insert(std::make_pair(AI, DDI));
}
bool Changed = false;
// A set of deleted alloca instruction pointers which should be removed from