Avoid duplicate interp sync-up on return

We only needed the case in remove_one_frame now because of lazy deopt,
so just move it there instead, now that unwind frame is doing the whole
thing.

src/core/frame.c

@@ -903,11 +903,6 @@ static MVMuint64 remove_one_frame(MVMThreadContext *tc, MVMuint8 unwind) {
 
     /* Switch back to the caller frame if there is one. */
     if (caller && (returner != tc->thread_entry_frame || tc->nested_interpreter)) {
-        *(tc->interp_cur_op) = caller->return_address;
-        *(tc->interp_bytecode_start) = MVM_frame_effective_bytecode(caller);
-        *(tc->interp_reg_base) = caller->work;
-        *(tc->interp_cu) = caller->static_info->body.cu;
-
         /* Handle any special return hooks. */
         if (caller->extra) {
             MVMFrameExtra *e = caller->extra;

src/spesh/deopt.c

@@ -422,10 +422,16 @@ void MVM_spesh_deopt_during_unwind(MVMThreadContext *tc) {
         fprintf(stderr, "    Deopt %u -> %u without uninlining\n", deopt_offset, deopt_target);
 #endif
         tc->cur_frame = top_frame;
-
         finish_frame_deopt(tc, frame);
     }
 
+    /* Sync interpreter so it's ready to continue running this deoptimized
+     * frame. */
+    *(tc->interp_cur_op) = tc->cur_frame->return_address;
+    *(tc->interp_bytecode_start) = MVM_frame_effective_bytecode(tc->cur_frame);
+    *(tc->interp_reg_base) = tc->cur_frame->work;
+    *(tc->interp_cu) = tc->cur_frame->static_info->body.cu;
+
     /* Update the record to indicate we're no long in need of deopt. */
     record->kind = record->orig_kind;
 }