|
From: <sv...@va...> - 2005-06-21 03:36:03
|
Author: njn
Date: 2005-06-21 04:36:01 +0100 (Tue, 21 Jun 2005)
New Revision: 3981
Log:
Remove redundancy.
Modified:
trunk/coregrind/m_redir.c
Modified: trunk/coregrind/m_redir.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_redir.c 2005-06-21 03:30:51 UTC (rev 3980)
+++ trunk/coregrind/m_redir.c 2005-06-21 03:36:01 UTC (rev 3981)
@@ -216,19 +216,15 @@
if (si->seg->flags & SF_VALGRIND)
return False;
=20
- resolved =3D VG_(is_resolved)(redir);
-
+ resolved =3D from_resolved(redir);
vg_assert(!resolved);
+ vg_assert(redir->from_sym !=3D NULL);
=20
- if (!from_resolved(redir)) {
- vg_assert(redir->from_sym !=3D NULL);
-
- if (match_lib(redir->from_lib, si)) {
- redir->from_addr =3D VG_(reverse_search_one_symtab)(si, redir->from_sy=
m);
- if (VG_(clo_trace_redir) && redir->from_addr !=3D 0)
- VG_(printf)(" bind FROM: %p =3D %s:%s\n",=20
- redir->from_addr,redir->from_lib, redir->from_sy=
m );
- }
+ if (match_lib(redir->from_lib, si)) {
+ redir->from_addr =3D VG_(reverse_search_one_symtab)(si, redir->fro=
m_sym);
+ if (VG_(clo_trace_redir) && redir->from_addr !=3D 0)
+ VG_(printf)(" bind FROM: %p =3D %s:%s\n",=20
+ redir->from_addr,redir->from_lib, redir->from_sym )=
;
}
=20
resolved =3D from_resolved(redir);
|