1 files changed, 4 insertions, 2 deletions
diff --git a/insns.def b/insns.def
index b616368992..12cbed730d 100644
--- a/insns.def
+++ b/insns.def
@@ -1116,10 +1116,12 @@ leave
     RUBY_VM_CHECK_INTS(th);
 
     if (UNLIKELY(VM_FRAME_TYPE_FINISH_P(GET_CFP()))) {
+	vm_pop_frame(th);
+
 #if OPT_CALL_THREADED_CODE
-	rb_bug("unused instruction on OPT_CALL_THREADED_CODE");
+	th->retval = val;
+	return 0;
 #else
-	vm_pop_frame(th);
 	return val;
 #endif
     }