6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-14 14:24:05 +00:00
Code Issues Projects Releases Wiki Activity

Assing line number info to new PHIs created by SSA updater.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@130551 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Devang Patel
2011-04-29 22:28:59 +00:00
parent d94bc549fc
commit 40348e8d1f
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Transforms/Utils/BasicBlockUtils.h
View File

@ -19,6 +19,7 @@
#include "llvm/BasicBlock.h" #include "llvm/BasicBlock.h"
#include "llvm/Support/CFG.h" #include "llvm/Support/CFG.h"
#include "llvm/Support/DebugLoc.h"
namespace llvm { namespace llvm {
@ -181,6 +182,10 @@ BasicBlock *SplitBlockPredecessors(BasicBlock *BB, BasicBlock *const *Preds,
ReturnInst *FoldReturnIntoUncondBranch(ReturnInst *RI, BasicBlock *BB, ReturnInst *FoldReturnIntoUncondBranch(ReturnInst *RI, BasicBlock *BB,
BasicBlock *Pred); BasicBlock *Pred);
/// GetFirstDebugLocInBasicBlock - Return first valid DebugLoc entry in a
/// given basic block.
DebugLoc GetFirstDebugLocInBasicBlock(const BasicBlock *BB);
} // End llvm namespace } // End llvm namespace
#endif #endif

12
lib/Transforms/Utils/BasicBlockUtils.cpp
View File

@ -538,3 +538,15 @@ ReturnInst *llvm::FoldReturnIntoUncondBranch(ReturnInst *RI, BasicBlock *BB,
UncondBranch->eraseFromParent(); UncondBranch->eraseFromParent();
return cast<ReturnInst>(NewRet); return cast<ReturnInst>(NewRet);
} }
/// GetFirstDebugLocInBasicBlock - Return first valid DebugLoc entry in a
/// given basic block.
DebugLoc llvm::GetFirstDebugLocInBasicBlock(const BasicBlock *BB) {
for (BasicBlock::const_iterator BI = BB->begin(), BE = BB->end();
BI != BE; ++BI) {
DebugLoc DL = BI->getDebugLoc();
if (!DL.isUnknown())
return DL;
}
return DebugLoc();
}

5
lib/Transforms/Utils/SSAUpdater.cpp
View File

@ -21,8 +21,10 @@
#include "llvm/Support/CFG.h" #include "llvm/Support/CFG.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Transforms/Utils/SSAUpdater.h" #include "llvm/Transforms/Utils/SSAUpdater.h"
#include "llvm/Transforms/Utils/SSAUpdaterImpl.h" #include "llvm/Transforms/Utils/SSAUpdaterImpl.h"
using namespace llvm; using namespace llvm;
typedef DenseMap<BasicBlock*, Value*> AvailableValsTy; typedef DenseMap<BasicBlock*, Value*> AvailableValsTy;
@ -185,6 +187,9 @@ Value *SSAUpdater::GetValueInMiddleOfBlock(BasicBlock *BB) {
return V; return V;
} }
// Set DebugLoc.
InsertedPHI->setDebugLoc(GetFirstDebugLocInBasicBlock(BB));
// If the client wants to know about all new instructions, tell it. // If the client wants to know about all new instructions, tell it.
if (InsertedPHIs) InsertedPHIs->push_back(InsertedPHI); if (InsertedPHIs) InsertedPHIs->push_back(InsertedPHI);