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 5ce0e568420624c13e75812347cc250322897c21..a796514ed54598b1713014e4e7af519ead8cb06c 100644 (file)
--- 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;