diff options
| author | Dan Gohman <gohman@apple.com> | 2009-05-07 19:46:24 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2009-05-07 19:46:24 +0000 |
| commit | 4bb6fa23cb51aacdf9faa4e7af01ea329cc8d742 (patch) | |
| tree | 455f9a807b9769e32719a6fce550337b784922d9 /llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | |
| parent | 140a6f24f0ca2bdc7694add39c0b84063eeb1174 (diff) | |
| download | bcm5719-llvm-4bb6fa23cb51aacdf9faa4e7af01ea329cc8d742.tar.gz bcm5719-llvm-4bb6fa23cb51aacdf9faa4e7af01ea329cc8d742.zip | |
Revert 71165. It did more than just revert 71158 and it introduced
several regressions. The problem due to 71158 is now fixed.
llvm-svn: 71176
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/FastISel.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/FastISel.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp index ec7aeb07655..22051867a00 100644 --- a/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp @@ -365,8 +365,7 @@ bool FastISel::SelectCall(User *I) { BuildMI(MBB, DL, II).addImm(ID); } else { const TargetInstrDesc &II = TII.get(TargetInstrInfo::DBG_LABEL); - ID = DW->RecordRegionEnd(cast<GlobalVariable>(REI->getContext()), - Subprogram); + ID = DW->RecordRegionEnd(cast<GlobalVariable>(REI->getContext())); BuildMI(MBB, DL, II).addImm(ID); } } @@ -392,7 +391,6 @@ bool FastISel::SelectCall(User *I) { // FIXME : Why DebugLoc is reset at the beginning of each block ? if (PrevLoc.isUnknown()) return true; - // Record the source line. unsigned Line = Subprogram.getLineNumber(); setCurDebugLoc(DebugLoc::get(MF.getOrCreateDebugLocID( @@ -412,10 +410,10 @@ bool FastISel::SelectCall(User *I) { unsigned Line = Subprogram.getLineNumber(); MF.setDefaultDebugLoc(DebugLoc::get(MF.getOrCreateDebugLocID( CompileUnit.getGV(), Line, 0))); - - if (DW && DW->ShouldEmitDwarfDebug()) + if (DW && DW->ShouldEmitDwarfDebug()) { // llvm.dbg.func_start also defines beginning of function scope. DW->RecordRegionStart(cast<GlobalVariable>(FSI->getSubprogram())); + } } return true; |
