From: Julian Seward <jseward@acm.org>
Date: Mon, 9 May 2011 22:51:14 +0000 (+0000)
Subject: Back out r11705, which was an attempt to make reading of line number
X-Git-Tag: svn/VALGRIND_3_7_0~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8ca357dffcff921ec629914fb72a865428454f3;p=thirdparty%2Fvalgrind.git

Back out r11705, which was an attempt to make reading of line number
info created by LLVM 2.9 work properly.  As per long discussion in
#272189, this isn't actually possible -- LLVM 2.9 creates bogus line
number info, and the bogusness can't be worked around at the Valgrind
end.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11738
---

diff --git a/coregrind/m_debuginfo/readdwarf.c b/coregrind/m_debuginfo/readdwarf.c
index 5ce0e56842..a796514ed5 100644
--- a/coregrind/m_debuginfo/readdwarf.c
+++ b/coregrind/m_debuginfo/readdwarf.c
@@ -1110,16 +1110,8 @@ void read_unitinfo_dwarf2( /*OUT*/UnitInfo* ui,
                                             /* perhaps should assign
                                                unconditionally to cval? */
 
-            case 0x01: /* FORM_addr */      if (addr_size == 4) {
-                                               cval = *(UInt*)p;
-                                            } else if (addr_size == 8) {
-                                               cval = *(ULong*)p;
-                                            } else {
-                                               /* wtf, Houston? */
-                                            }
-                                            p += addr_size; break;
-
             /* TODO : Following ones just skip data - implement if you need */
+            case 0x01: /* FORM_addr */      p += addr_size; break;
             case 0x03: /* FORM_block2 */    p += *((UShort*)p) + 2; break;
             case 0x04: /* FORM_block4 */    p += *((UInt*)p) + 4; break;
             case 0x09: /* FORM_block */     p += read_leb128U( &p ); break;