Changeset 63201 in vbox for trunk/src/VBox/Runtime/common/dbg

Timestamp:

Aug 9, 2016 12:14:49 PM (8 years ago)

Author:

vboxsync

Message:

Runtime/common/dbg/dbgmoddwarf.cpp: Fix getting line numbers from DWARF debug info generated by LLVM, it emits debug info for global constructors inserted by the compiler resulting in the line number being 0 making parsing the debug info fail and source code lines not being displayed in RTLdrFlt for example

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp

@@ -2463 +2463 @@
                   cOpIndexDelta, pLnState->Regs.idxOp));
 
-            rc = rtDwarfLine_AddLine(pLnState, offOpCode);
+            /*
+             * LLVM emits debug info for global constructors (_GLOBAL__I_a) which are not part of source
+             * code but are inserted by the compiler: The resulting line number will be 0
+             * because they are not part of the source file obviously (see https://review.llvm.org/rL205999),
+             * so skip adding them when they are encountered.
+             */
+            if (pLnState->Regs.uLine)
+                rc = rtDwarfLine_AddLine(pLnState, offOpCode);
         }
         else
@@ -2474 +2481 @@
                 case DW_LNS_copy:
                     Log2(("%08x: DW_LNS_copy\n", offOpCode));
-                    rc = rtDwarfLine_AddLine(pLnState, offOpCode);
+                    /* See the comment about LLVM above. */
+                    if (pLnState->Regs.uLine)
+                        rc = rtDwarfLine_AddLine(pLnState, offOpCode);
                     break;