Remove the Segment back-pointer from SegInfo. The only place it was

being used was in resolve_redir(), and due to the way resolve_redir()
is called, the involved test was always failing anyway.  So we lose
nothing by removing it except some complexity -- there is no longer a
circularity between Segments and SegInfos.

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

diff --git a/coregrind/m_debuginfo/priv_symtab.h b/coregrind/m_debuginfo/priv_symtab.h
index 72a72f7f7011426b34ff9ef4ec4bef00cadd1beb..65c062670546d98467745f768fe944eb0d691a21 100644 (file)
--- a/coregrind/m_debuginfo/priv_symtab.h
+++ b/coregrind/m_debuginfo/priv_symtab.h
@@ -171,7 +171,6 @@ extern void ML_(ppCfiSI)   ( CfiSI* );
 struct _SegInfo {
    struct _SegInfo* next;      /* list of SegInfos */
 
-   Segment     *seg;           /* first segment we're mapped out of */
    Int         ref;
 
    /* Description of the mapped segment. */

diff --git a/coregrind/m_debuginfo/symtab.c b/coregrind/m_debuginfo/symtab.c
index 62f7cff7f9f1d3405408bfb6626b0eb673a094dc..2ffad73b73ab81634aa0d533355225ca622cc74b 100644 (file)
--- a/coregrind/m_debuginfo/symtab.c
+++ b/coregrind/m_debuginfo/symtab.c
@@ -1648,8 +1648,6 @@ SegInfo *VG_(read_seg_symbols) ( Segment *seg )
    si->cfisi_size = si->cfisi_used = 0;
    si->cfisi_minaddr = si->cfisi_maxaddr = 0;
 
-   si->seg = seg;
-
    si->stab_typetab = NULL;
 
    si->plt_start  = si->plt_size  = 0;

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 3ffa9cda5674db4bd20a120123cc0fcdf2b31060..e7870220360a58eadcb3e22d2942442226524b2d 100644 (file)
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -210,11 +210,6 @@ static Bool resolve_redir(CodeRedirect *redir, const SegInfo *si)
    Bool resolved;
 
    vg_assert(si != NULL);
-   vg_assert(si->seg != NULL);
-
-   /* no redirection from Valgrind segments */
-   if (si->seg->flags & SF_VALGRIND)
-      return False;
 
    resolved = from_resolved(redir);
    vg_assert(!resolved);