Remove trivial CSE.

git-svn-id: svn://svn.valgrind.org/vex/trunk@814

diff --git a/VEX/priv/guest-amd64/toIR.c b/VEX/priv/guest-amd64/toIR.c
index dced240f1f422334de889b2d66af7de736976fdf..41554e01706a7654b7f81370105e696fd56c9114 100644 (file)
--- a/VEX/priv/guest-amd64/toIR.c
+++ b/VEX/priv/guest-amd64/toIR.c
@@ -444,13 +444,14 @@ IRBB* bbToIR_AMD64 ( UChar*           amd64code,
 
       first_stmt_idx = irbb->stmts_used;
 
+      guest_rip_curr_instr = guest_rip_bbstart + delta;
+
       if (n_instrs > 0) {
          /* for the first insn, the dispatch loop will have set
-            %EIP, but for all the others we have to do it ourselves. */
-         stmt( IRStmt_Put( OFFB_RIP, mkU64(guest_rip_bbstart + delta)) );
+            %RIP, but for all the others we have to do it ourselves. */
+         stmt( IRStmt_Put( OFFB_RIP, mkU64(guest_rip_curr_instr)) );
       }
 
-      guest_rip_curr_instr = guest_rip_bbstart + delta;
       dres = disInstr( resteerOK, chase_into_ok, 
                        delta, subarch_guest, &size, &guest_next );
       insn_verbose = False;