commit a6e9fb9d43b572412fb12240dbf1a1e8fe930e29
author sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Dec 14 23:18:06 2002 +0000
committer sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Dec 14 23:18:06 2002 +0000
tree 60d6820d22a6cb38d7cbe6cffe1ad6b01069c241
parent 5de6ee0f515205603858c670b19e4b8c3237585f

VG_(handle_esp_assignment): merge two conditional jumps into one on
common path.


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

coregrind/vg_memory.c

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index 6b610a0..9e5b7d6 100644
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -320,7 +320,8 @@
 
 #  ifndef VG_DEBUG_MEMORY
 
-   if (IS_ALIGNED4_ADDR(old_esp) && IS_ALIGNED4_ADDR(new_esp)) {
+   /* if (IS_ALIGNED4_ADDR(old_esp) && IS_ALIGNED4_ADDR(new_esp)) { */
+   if (IS_ALIGNED4_ADDR((old_esp|new_esp))) {
 
       /* Deal with the most common cases fast.  These are ordered in
          the sequence most common first. */