[llvm-commits] CVS: llvm/lib/CodeGen/DwarfWriter.cpp

[Jim Laskey]

Changes in directory llvm/lib/CodeGen:

DwarfWriter.cpp updated: 1.64 -> 1.65
---
Log message:

References need to be section relative.


---
Diffs of the changes:  (+5 -3)

 DwarfWriter.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.64 llvm/lib/CodeGen/DwarfWriter.cpp:1.65
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.64	Mon Jun 19 10:48:00 2006
+++ llvm/lib/CodeGen/DwarfWriter.cpp	Mon Jun 19 14:49:42 2006
@@ -1205,7 +1205,7 @@
 
 /// AddSourceLine - Add location information to specified debug information
 /// entry.
-void DwarfWriter::AddSourceLine(DIE *Die, CompileUnitDesc *File, unsigned Line) {
+void DwarfWriter::AddSourceLine(DIE *Die, CompileUnitDesc *File, unsigned Line){
   if (File && Line) {
     CompileUnit *FileUnit = FindCompileUnit(File);
     unsigned FileID = FileUnit->getID();
@@ -1598,7 +1598,7 @@
     // Define the Scope debug information entry.
     DebugScope *Scope = Scopes[j];
     // FIXME - Ignore inlined functions for the time being.
-    if (Scope->getParent()) continue;
+    if (!Scope->getParent()) continue;
     
     DIE *ScopeDie = new DIE(DW_TAG_lexical_block);
     
@@ -2081,6 +2081,7 @@
   // Start the dwarf frame section.
   Asm->SwitchToDataSection(DwarfFrameSection, 0);
 
+  EmitLabel("frame_common", 0);
   EmitDifference("frame_common_end", 0,
                  "frame_common_begin", 0);
   EOL("Length of Common Information Entry");
@@ -2116,7 +2117,8 @@
   
   EmitLabel("frame_begin", SubprogramCount);
   
-  EmitReference("section_frame", 0); EOL("FDE CIE offset");
+  EmitDifference("frame_common", 0, "section_frame", 0);
+  EOL("FDE CIE offset");
 
   EmitReference("func_begin", SubprogramCount); EOL("FDE initial location");
   EmitDifference("func_end", SubprogramCount,