Merge 7712 - Ensure super instructions are marked during dynamic code modification.

src/trusted/validator/x86/ncval_reg_sfi/ncvalidate_iter.c

 /*
  * Copyright (c) 2011 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /*
  * ncvalidate_iter.c
  * Validate x86 instructions for Native Client
  *
@@ skipping 737 matching lines @@
   NaClSegmentInitialize(mbase_new, vbase, size, &segment_new);
   do {
     iter_old = NaClInstIterCreateWithLookback(state->decoder_tables,
                                               &segment_old, kLookbackSize);
     if (NULL == iter_old) break;
     iter_new = NaClInstIterCreateWithLookback(state->decoder_tables,
                                               &segment_new, kLookbackSize);
     if (NULL == iter_new) break;
     while (NaClInstIterHasNextInline(iter_old) &&
            NaClInstIterHasNextInline(iter_new)) {
-      Bool inst_changed;
       state->cur_inst_state = NaClInstIterGetStateInline(iter_new);
       state->cur_inst = NaClInstStateInst(state->cur_inst_state);
       state->cur_inst_vector = NaClInstStateExpVector(state->cur_inst_state);
-      inst_changed = NaClValidateInstReplacement(iter_old, iter_new, state);
-      if (inst_changed)
-        NaClApplyValidators(state, iter_new);
-      else
-        NaClJumpValidatorRememberIpOnly(state, iter_new);
+      state->cur_inst_state->unchanged =
+          !NaClValidateInstReplacement(iter_old, iter_new, state);
+      NaClApplyValidators(state, iter_new);
       if (state->quit) break;
       NaClInstIterAdvanceInline(iter_old);
       NaClInstIterAdvanceInline(iter_new);
     }
     if (NaClInstIterHasNextInline(iter_old) ||
         NaClInstIterHasNextInline(iter_new)) {
       NaClValidatorMessage(
           LOG_ERROR, state,
           "Code modification: code segments have different "
           "number of instructions\n");
     }
   } while (0);
 
   state->cur_inst_state = NULL;
   state->cur_inst = NULL;
   state->cur_inst_vector = NULL;
   NaClApplyPostValidators(state, iter_new);
   NaClInstIterDestroy(iter_old);
   NaClInstIterDestroy(iter_new);
 }