[llvm-commits] [llvm] r70803 - in /llvm/trunk: lib/CodeGen/AsmPrinter/DwarfWriter.cpp lib/CodeGen/SelectionDAG/FastISel.cpp lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp test/DebugInfo/2009-01-29-HeaderLocation.ll utils/TableGen/AsmWriterEmitter.cpp
Bill Wendling
isanbard at gmail.com
Sun May 3 15:42:00 PDT 2009
Argiris,
This patch is causing this failure on Darwin:
Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/
FrontendC++/dg.exp ...
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/
FrontendC++/2006-11-06-StackTrace.cpp
Failed with exit(1) at line 5
while running: gdb -q -batch -n -x 2006-11-06-StackTrace.cpp.tmp.in
2006-11-06-StackTrace.cpp.tmp.exe | tee 2006-11-06-
StackTrace.cpp.tmp.out | /usr/bin/grep {#0
DeepStack::deepest.*(this=.*,.*x=33)}
child process exited abnormally
Please investigate. In particular, please make sure that the debugging
info generated with your patch is the same as without it.
Thanks!
-bw
On May 3, 2009, at 3:03 PM, Argiris Kirtzidis wrote:
> Author: akirtzidis
> Date: Sun May 3 17:03:35 2009
> New Revision: 70803
>
> URL: http://llvm.org/viewvc/llvm-project?rev=70803&view=rev
> Log:
> -Remove the DwarfWriter::RecordSourceLine calls from the instruction
> selectors.
> -Depend on DebugLocs for source line info.
>
> Modified:
> llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
> llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
> llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> llvm/trunk/test/DebugInfo/2009-01-29-HeaderLocation.ll
> llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp
>
> Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=70803&r1=70802&r2=70803&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
> +++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Sun May 3
> 17:03:35 2009
> @@ -3262,13 +3262,6 @@
> // Assumes in correct section after the entry point.
> EmitLabel("func_begin", ++SubprogramCount);
>
> - // Emit label for the implicitly defined dbg.stoppoint at the
> start of
> - // the function.
> - if (!Lines.empty()) {
> - const SrcLineInfo &LineInfo = Lines[0];
> - Asm->printLabel(LineInfo.getLabelID());
> - }
> -
> if (TimePassesIsEnabled)
> DebugTimer->stopTimer();
> }
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp?rev=70803&r1=70802&r2=70803&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/FastISel.cpp Sun May 3
> 17:03:35 2009
> @@ -333,11 +333,6 @@
> unsigned Col = SPI->getColumn();
> unsigned Idx = MF.getOrCreateDebugLocID(CU.getGV(), Line, Col);
> setCurDebugLoc(DebugLoc::get(Idx));
> - if (DW && DW->ShouldEmitDwarfDebug()) {
> - unsigned ID = DW->RecordSourceLine(Line, Col, CU);
> - const TargetInstrDesc &II =
> TII.get(TargetInstrInfo::DBG_LABEL);
> - BuildMI(MBB, DL, II).addImm(ID);
> - }
> }
> return true;
> }
> @@ -402,7 +397,7 @@
> CompileUnit.getGV(),
> Line, 0)));
>
> if (DW && DW->ShouldEmitDwarfDebug()) {
> - unsigned LabelID = DW->RecordSourceLine(Line, 0,
> CompileUnit);
> + unsigned LabelID = MMI->NextLabelID();
> const TargetInstrDesc &II =
> TII.get(TargetInstrInfo::DBG_LABEL);
> BuildMI(MBB, DL, II).addImm(LabelID);
> DebugLocTuple PrevLocTpl = MF.getDebugLocTuple(PrevLoc);
> @@ -417,7 +412,6 @@
> setCurDebugLoc(DebugLoc::get(MF.getOrCreateDebugLocID(
> CompileUnit.getGV(),
> Line, 0)));
> if (DW && DW->ShouldEmitDwarfDebug()) {
> - DW->RecordSourceLine(Line, 0, CompileUnit);
> // llvm.dbg.func_start also defines beginning of function
> scope.
> DW->RecordRegionStart(cast<GlobalVariable>(FSI-
> >getSubprogram()));
> }
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=70803&r1=70802&r2=70803&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Sun
> May 3 17:03:35 2009
> @@ -3980,7 +3980,7 @@
> MF.getOrCreateDebugLocID(CompileUnit.getGV(),
> Line, 0)));
>
> if (DW && DW->ShouldEmitDwarfDebug()) {
> - unsigned LabelID = DW->RecordSourceLine(Line, 0,
> CompileUnit);
> + unsigned LabelID = DAG.getMachineModuleInfo()-
> >NextLabelID();
> DAG.setRoot(DAG.getLabel(ISD::DBG_LABEL, getCurDebugLoc(),
> getRoot(), LabelID));
> DebugLocTuple PrevLocTpl = MF.getDebugLocTuple(PrevLoc);
> @@ -3995,7 +3995,6 @@
> setCurDebugLoc(DebugLoc::get(
> MF.getOrCreateDebugLocID(CompileUnit.getGV(),
> Line, 0)));
> if (DW && DW->ShouldEmitDwarfDebug()) {
> - DW->RecordSourceLine(Line, 0, CompileUnit);
> // llvm.dbg.func_start also defines beginning of function
> scope.
> DW-
> >RecordRegionStart(cast<GlobalVariable>(FSI.getSubprogram()));
> }
>
> Modified: llvm/trunk/test/DebugInfo/2009-01-29-HeaderLocation.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/2009-01-29-HeaderLocation.ll?rev=70803&r1=70802&r2=70803&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/test/DebugInfo/2009-01-29-HeaderLocation.ll (original)
> +++ llvm/trunk/test/DebugInfo/2009-01-29-HeaderLocation.ll Sun May
> 3 17:03:35 2009
> @@ -1,4 +1,4 @@
> -; RUN: llvm-as < %s | llc | grep "m.h" | count 1
> +; RUN: llvm-as < %s | llc | grep "\\"m.h\\"" | count 1
> target triple = "i386-apple-darwin9.6"
> %llvm.dbg.anchor.type = type { i32, i32 }
> %llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64,
> i64, i64, i32, i32 }
>
> Modified: llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp?rev=70803&r1=70802&r2=70803&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp (original)
> +++ llvm/trunk/utils/TableGen/AsmWriterEmitter.cpp Sun May 3
> 17:03:35 2009
> @@ -650,12 +650,12 @@
> O << "\";\n\n";
>
> O << " if (TAI->doesSupportDebugInformation() &&\n"
> - << " DW->ShouldEmitDwarfDebug() && OptLevel !=
> CodeGenOpt::None) {\n"
> + << " DW->ShouldEmitDwarfDebug()) {\n"
> << " DebugLoc CurDL = MI->getDebugLoc();\n\n"
> << " if (!CurDL.isUnknown()) {\n"
> << " static DebugLocTuple PrevDLT(0, ~0U, ~0U);\n"
> << " DebugLocTuple CurDLT = MF->getDebugLocTuple(CurDL);\n\n"
> - << " if (PrevDLT.CompileUnit != 0 && PrevDLT != CurDLT)\n"
> + << " if (CurDLT.CompileUnit != 0 && PrevDLT != CurDLT)\n"
> << " printLabel(DW->RecordSourceLine(CurDLT.Line,
> CurDLT.Col,\n"
> << "
> DICompileUnit(CurDLT.CompileUnit)));\n\n"
> << " PrevDLT = CurDLT;\n"
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
More information about the llvm-commits
mailing list