[llvm-commits] [llvm] r118365 - in /llvm/trunk: include/llvm/MC/MCAssembler.h lib/MC/MCAssembler.cpp test/MC/ELF/relax-crash.s

[Rafael Espindola]

Author: rafael
Date: Sat Nov  6 21:07:12 2010
New Revision: 118365

URL: http://llvm.org/viewvc/llvm-project?rev=118365&view=rev
Log:
Relax dwarf line fragments. This fixes a crash in the included testcase.

Added:
    llvm/trunk/test/MC/ELF/relax-crash.s
Modified:
    llvm/trunk/include/llvm/MC/MCAssembler.h
    llvm/trunk/lib/MC/MCAssembler.cpp

Modified: llvm/trunk/include/llvm/MC/MCAssembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAssembler.h?rev=118365&r1=118364&r2=118365&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCAssembler.h (original)
+++ llvm/trunk/include/llvm/MC/MCAssembler.h Sat Nov  6 21:07:12 2010
@@ -388,11 +388,14 @@
   /// make up the address delta between two .loc dwarf directives.
   const MCExpr *AddrDelta;
 
+  /// Size - The current size estimate.
+  uint64_t Size;
+
 public:
   MCDwarfLineAddrFragment(int64_t _LineDelta, const MCExpr &_AddrDelta,
                       MCSectionData *SD = 0)
     : MCFragment(FT_Dwarf, SD),
-      LineDelta(_LineDelta), AddrDelta(&_AddrDelta) {}
+      LineDelta(_LineDelta), AddrDelta(&_AddrDelta), Size(1) {}
 
   /// @name Accessors
   /// @{
@@ -401,6 +404,10 @@
 
   const MCExpr &getAddrDelta() const { return *AddrDelta; }
 
+  uint64_t getSize() const { return Size; }
+
+  void setSize(uint64_t Size_) { Size = Size_; }
+
   /// @}
 
   static bool classof(const MCFragment *F) {
@@ -727,6 +734,9 @@
   bool RelaxLEB(const MCObjectWriter &Writer, MCAsmLayout &Layout,
                 MCLEBFragment &IF);
 
+  bool RelaxDwarfLineAddr(const MCObjectWriter &Writer, MCAsmLayout &Layout,
+			  MCDwarfLineAddrFragment &DF);
+
   /// FinishLayout - Finalize a layout, including fragment lowering.
   void FinishLayout(MCAsmLayout &Layout);
 

Modified: llvm/trunk/lib/MC/MCAssembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=118365&r1=118364&r2=118365&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAssembler.cpp (original)
+++ llvm/trunk/lib/MC/MCAssembler.cpp Sat Nov  6 21:07:12 2010
@@ -340,19 +340,8 @@
   case MCFragment::FT_Org:
     return cast<MCOrgFragment>(F).getSize();
 
-  case MCFragment::FT_Dwarf: {
-    const MCDwarfLineAddrFragment &OF = cast<MCDwarfLineAddrFragment>(F);
-
-    // The AddrDelta is really unsigned and it can only increase.
-    int64_t AddrDelta;
-
-    OF.getAddrDelta().EvaluateAsAbsolute(AddrDelta, &Layout);
-
-    int64_t LineDelta;
-    LineDelta = OF.getLineDelta();
-
-    return MCDwarfLineAddr::ComputeSize(LineDelta, AddrDelta);
-  }
+  case MCFragment::FT_Dwarf:
+    return cast<MCDwarfLineAddrFragment>(F).getSize();
   }
 
   assert(0 && "invalid fragment kind");
@@ -861,6 +850,18 @@
   return OldSize != LF.getSize();
 }
 
+bool MCAssembler::RelaxDwarfLineAddr(const MCObjectWriter &Writer,
+				     MCAsmLayout &Layout,
+				     MCDwarfLineAddrFragment &DF) {
+  int64_t AddrDelta;
+  DF.getAddrDelta().EvaluateAsAbsolute(AddrDelta, &Layout);
+  int64_t LineDelta;
+  LineDelta = DF.getLineDelta();
+  uint64_t OldSize = DF.getSize();
+  DF.setSize(MCDwarfLineAddr::ComputeSize(LineDelta, AddrDelta));
+  return OldSize != DF.getSize();  
+}
+
 bool MCAssembler::LayoutOnce(const MCObjectWriter &Writer,
                              MCAsmLayout &Layout) {
   ++stats::RelaxationSteps;
@@ -886,6 +887,10 @@
       case MCFragment::FT_Org:
         WasRelaxed |= RelaxOrg(Writer, Layout, *cast<MCOrgFragment>(it2));
         break;
+      case MCFragment::FT_Dwarf:
+        WasRelaxed |= RelaxDwarfLineAddr(Writer, Layout,
+					 *cast<MCDwarfLineAddrFragment>(it2));
+	break;
       case MCFragment::FT_LEB:
         WasRelaxed |= RelaxLEB(Writer, Layout, *cast<MCLEBFragment>(it2));
         break;

Added: llvm/trunk/test/MC/ELF/relax-crash.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/relax-crash.s?rev=118365&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/relax-crash.s (added)
+++ llvm/trunk/test/MC/ELF/relax-crash.s Sat Nov  6 21:07:12 2010
@@ -0,0 +1,11 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t
+
+// This is a test that we don't crash. We used to do so by going in a infinite
+// recursion trying to compute the size of a MCDwarfLineAddrFragment.
+
+       .section        .debug_line,"", at progbits
+       .text
+       .file 1 "Disassembler.ii"
+       .section foo
+       .loc 1 1 0
+       ret