From: Nicholas Nethercote <njn@valgrind.org>
Date: Tue, 21 Jun 2005 03:36:01 +0000 (+0000)
Subject: Remove redundancy.
X-Git-Tag: svn/VALGRIND_3_0_0~337
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0097c7053aa9b0d0a28075d30a77bc1b7eef9309;p=thirdparty%2Fvalgrind.git

Remove redundancy.


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

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 4c6d8ff079..4615b7283c 100644
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -216,19 +216,15 @@ static Bool resolve_redir(CodeRedirect *redir, const SegInfo *si)
    if (si->seg->flags & SF_VALGRIND)
       return False;
 
-   resolved = VG_(is_resolved)(redir);
-
+   resolved = from_resolved(redir);
    vg_assert(!resolved);
+   vg_assert(redir->from_sym != NULL);
 
-   if (!from_resolved(redir)) {
-      vg_assert(redir->from_sym != NULL);
-
-      if (match_lib(redir->from_lib, si)) {
-	 redir->from_addr = VG_(reverse_search_one_symtab)(si, redir->from_sym);
-	 if (VG_(clo_trace_redir) && redir->from_addr != 0)
-	    VG_(printf)("   bind FROM: %p = %s:%s\n", 
-                        redir->from_addr,redir->from_lib, redir->from_sym );
-      }
+   if (match_lib(redir->from_lib, si)) {
+      redir->from_addr = VG_(reverse_search_one_symtab)(si, redir->from_sym);
+      if (VG_(clo_trace_redir) && redir->from_addr != 0)
+         VG_(printf)("   bind FROM: %p = %s:%s\n", 
+                     redir->from_addr,redir->from_lib, redir->from_sym );
    }
 
    resolved = from_resolved(redir);