From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 24 Jun 2016 09:20:41 +0000 (+0300)
Subject: Added ability to make non-local control transfer through interrupt function
X-Git-Tag: php-7.1.0alpha3~93
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6387c0aa5e5475d9a028697d4aa99bee9445e6d;p=php

Added ability to make non-local control transfer through interrupt function
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index feded0a937..dcfaf97b10 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -8613,7 +8613,7 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)
 	} else if (zend_interrupt_function) {
 		SAVE_OPLINE();
 		zend_interrupt_function(execute_data);
-		LOAD_OPLINE();
+		ZEND_VM_ENTER();
 	}
 	ZEND_VM_CONTINUE();
 }
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 1943dc553a..e68f8e4bed 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2081,7 +2081,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper_SPEC(ZEND_OPC
 	} else if (zend_interrupt_function) {
 		SAVE_OPLINE();
 		zend_interrupt_function(execute_data);
-		LOAD_OPLINE();
+		ZEND_VM_ENTER();
 	}
 	ZEND_VM_CONTINUE();
 }