diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2010-04-29 06:33:38 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2010-04-29 06:33:38 +0000 |
| commit | a36acad67ddade353a79a6b1a7b43bfaa01e86e1 (patch) | |
| tree | 2444a5bcc5fd5105496456c6c58e0f8219d0c34f /lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | |
| parent | 28edeb765bc64e1859f698daf84e5500bf86a84c (diff) | |
Re-enable 102565 with fixes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@102602 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp index fe52040d45..9001894d6f 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -3707,15 +3707,17 @@ SelectionDAGBuilder::EmitFuncArgumentDbgValue(const DbgValueInst &DI, } } - if (!Reg) - Reg = FuncInfo.ValueMap[V]; - if (!Reg) - return false; + if (!Reg) { + DenseMap<const Value *, unsigned>::iterator VMI = FuncInfo.ValueMap.find(V); + if (VMI == FuncInfo.ValueMap.end()) + return false; + Reg = VMI->second; + } const TargetInstrInfo *TII = DAG.getTarget().getInstrInfo(); MachineInstrBuilder MIB = BuildMI(MF, getCurDebugLoc(), TII->get(TargetOpcode::DBG_VALUE)) - .addReg(Reg).addImm(Offset).addMetadata(Variable); + .addReg(Reg, RegState::Debug).addImm(Offset).addMetadata(Variable); FuncInfo.ArgDbgValues.push_back(&*MIB); return true; } @@ -3896,15 +3898,11 @@ SelectionDAGBuilder::visitIntrinsicCall(const CallInst &I, unsigned Intrinsic) { } else { SDValue &N = NodeMap[V]; if (N.getNode()) { -#if 0 if (!EmitFuncArgumentDbgValue(DI, V, Variable, Offset, N)) { -#endif SDV = DAG.getDbgValue(Variable, N.getNode(), N.getResNo(), Offset, dl, SDNodeOrder); DAG.AddDbgValue(SDV, N.getNode(), false); -#if 0 } -#endif } else { // We may expand this to cover more cases. One case where we have no // data available is an unreferenced parameter; we need this fallback. |