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

common path.

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

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index 6b610a0b9d00b155536078965ead201570a9ed09..9e5b7d690007d5a29a72a94abd473bf4c56d1bb6 100644 (file)
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -320,7 +320,8 @@ void VG_(handle_esp_assignment) ( Addr new_esp )
 
 #  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. */