From: Julian Seward <jseward@acm.org>
Date: Wed, 22 Oct 2008 15:49:59 +0000 (+0000)
Subject: Don't assert on icc9 generated Dwarf3.
X-Git-Tag: svn/VALGRIND_3_4_0~198
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9f215985a5b26045064cde6f5dfc139d2d5ccc;p=thirdparty%2Fvalgrind.git

Don't assert on icc9 generated Dwarf3.


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

diff --git a/coregrind/m_debuginfo/readdwarf3.c b/coregrind/m_debuginfo/readdwarf3.c
index 84248b23f1..a6d432eee8 100644
--- a/coregrind/m_debuginfo/readdwarf3.c
+++ b/coregrind/m_debuginfo/readdwarf3.c
@@ -3760,10 +3760,14 @@ void new_dwarf3_reader_wrk (
    ML_(dinfo_free)( tyents_to_keep_cache );
    tyents_to_keep_cache = NULL;
 
-   /* and the file name table (just the array, not the entries 
-      themselves). */
-   vg_assert(varparser.filenameTable);
-   VG_(deleteXA)( varparser.filenameTable );
+   /* and the file name table (just the array, not the entries
+      themselves).  (Apparently, 2008-Oct-23, varparser.filenameTable
+      can be NULL here, for icc9 generated Dwarf3.  Not sure what that
+      signifies (a deeper problem with the reader?)) */
+   if (varparser.filenameTable) {
+      VG_(deleteXA)( varparser.filenameTable );
+      varparser.filenameTable = NULL;
+   }
 
    /* record the GExprs in di so they can be freed later */
    vg_assert(!di->admin_gexprs);