commit 1d6c4bc38bd938c055bc57c614769cee59de4793
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Nov 21 13:38:08 2002 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Thu Nov 21 13:38:08 2002 +0000
tree 67b4be32e4e3f0aad4969f8b161692957831ed08
parent ce1d7a8020348abfd70daa04ec362dd1520542f9

Moved setting of err->where outside the if/else;  it was redundant because the
same test is done with VG_(get_ExeContext2)().


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1331 a5019735-40e9-0310-863c-91ae7b9d1cf9

coregrind/vg_errcontext.c

diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c
index 4d82b50..f00e6b6 100644
--- a/coregrind/vg_errcontext.c
+++ b/coregrind/vg_errcontext.c
@@ -182,18 +182,14 @@
    err->next     = NULL;
    err->supp     = NULL;
    err->count    = 1;
+   err->where    = VG_(get_ExeContext)( tst );
+
    if (NULL == tst) {
       err->tid   = VG_(get_current_tid)();
-      err->where = 
-         VG_(get_ExeContext2)( VG_(baseBlock)[VGOFF_(m_eip)], 
-                               VG_(baseBlock)[VGOFF_(m_ebp)],
-                               VG_(baseBlock)[VGOFF_(m_esp)],
-                               VG_(threads)[err->tid].stack_highest_word);
       err->m_eip = VG_(baseBlock)[VGOFF_(m_eip)];
       err->m_esp = VG_(baseBlock)[VGOFF_(m_esp)];
       err->m_ebp = VG_(baseBlock)[VGOFF_(m_ebp)];
    } else {
-      err->where = VG_(get_ExeContext) ( tst );
       err->tid   = tst->tid;
       err->m_eip = tst->m_eip;
       err->m_esp = tst->m_esp;