Remove redundancy.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3981 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 4c6d8ff..4615b72 100644
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -216,19 +216,15 @@
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);