1 files changed, 22 insertions, 10 deletions

diff --git a/erts/emulator/beam/instrs.tab b/erts/emulator/beam/instrs.tab
index 690bd3a848..7ea9dee299 100644
--- a/erts/emulator/beam/instrs.tab
+++ b/erts/emulator/beam/instrs.tab
@@ -78,7 +78,14 @@ move_deallocate_return(Src, Deallocate) {
 
 // Call instructions
 
-DISPATCH(CallDest) {
+DISPATCH_REL(CallDest) {
+    //| -no_next
+    $SET_I_REL($CallDest);
+    DTRACE_LOCAL_CALL(c_p, erts_code_to_codemfa(I));
+    Dispatch();
+}
+
+DISPATCH_ABS(CallDest) {
     //| -no_next
     SET_I((BeamInstr *) $CallDest);
     DTRACE_LOCAL_CALL(c_p, erts_code_to_codemfa(I));
@@ -87,18 +94,18 @@ DISPATCH(CallDest) {
 
 i_call(CallDest) {
     SET_CP(c_p, $NEXT_INSTRUCTION);
-    $DISPATCH($CallDest);
+    $DISPATCH_REL($CallDest);
 }
 
 move_call(Src, CallDest) {
     x(0) = $Src;
     SET_CP(c_p, $NEXT_INSTRUCTION);
-    $DISPATCH($CallDest);
+    $DISPATCH_REL($CallDest);
 }
 
 i_call_last(CallDest, Deallocate) {
     $deallocate($Deallocate);
-    $DISPATCH($CallDest);
+    $DISPATCH_REL($CallDest);
 }
 
 move_call_last(Src, CallDest, Deallocate) {
@@ -107,7 +114,7 @@ move_call_last(Src, CallDest, Deallocate) {
 }
 
 i_call_only(CallDest) {
-    $DISPATCH($CallDest);
+    $DISPATCH_REL($CallDest);
 }
 
 move_call_only(Src, CallDest) {
@@ -168,7 +175,8 @@ i_apply() {
     BeamInstr *next;
     $APPLY(NULL, 0, next);
     if (ERTS_LIKELY(next != NULL)) {
-        $i_call(next);
+        SET_CP(c_p, $NEXT_INSTRUCTION);
+        $DISPATCH_ABS(next);
     }
     $HANDLE_APPLY_ERROR();
 }
@@ -177,7 +185,8 @@ i_apply_last(Deallocate) {
     BeamInstr *next;
     $APPLY(I, $Deallocate, next);
     if (ERTS_LIKELY(next != NULL)) {
-        $i_call_last(next, $Deallocate);
+        $deallocate($Deallocate);
+        $DISPATCH_ABS(next);
     }
     $HANDLE_APPLY_ERROR();
 }
@@ -186,7 +195,7 @@ i_apply_only() {
     BeamInstr *next;
     $APPLY(I, 0, next);
     if (ERTS_LIKELY(next != NULL)) {
-        $i_call_only(next);
+        $DISPATCH_ABS(next);
     }
     $HANDLE_APPLY_ERROR();
 }
@@ -202,7 +211,8 @@ apply(Arity) {
     BeamInstr *next;
     $FIXED_APPLY($Arity, NULL, 0, next);
     if (ERTS_LIKELY(next != NULL)) {
-        $i_call(next);
+        SET_CP(c_p, $NEXT_INSTRUCTION);
+        $DISPATCH_ABS(next);
     }
     $HANDLE_APPLY_ERROR();
 }
@@ -211,7 +221,8 @@ apply_last(Arity, Deallocate) {
     BeamInstr *next;
     $FIXED_APPLY($Arity, I, $Deallocate, next);
     if (ERTS_LIKELY(next != NULL)) {
-        $i_call_last(next, $Deallocate);
+        $deallocate($Deallocate);
+        $DISPATCH_ABS(next);
     }
     $HANDLE_APPLY_ERROR();
 }
@@ -560,6 +571,7 @@ i_put_tuple.fill(Arity) {
         }
     } while (--arity != 0);
     HTOP = hp;
+    ASSERT(VALID_INSTR(* (Eterm *)I));
     Goto(*I);
 }