Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value)

8 files changed, 83 insertions, 73 deletions

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e8a16c4ef0..0b4941e1f4 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -5201,15 +5201,17 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 				zend_error_noreturn(E_COMPILE_ERROR, "Cannot re-assign $this");
 			}
 
-			opline->op2_type = IS_CV;
-			opline->op2.var = lookup_cv(CG(active_op_array), var_name);
+			opline->result_type = IS_CV;
+			opline->result.var = lookup_cv(CG(active_op_array), var_name);
 
-			opline->result.num = is_last_catch && is_last_class;
+			if (is_last_catch && is_last_class) {
+				opline->extended_value = ZEND_LAST_CATCH;
+			}
 
 			if (!is_last_class) {
 				jmp_multicatch[j] = zend_emit_jump(0);
 				opline = &CG(active_op_array)->opcodes[opnum_catch];
-				opline->extended_value = get_next_op_number(CG(active_op_array));
+				opline->op2.opline_num = get_next_op_number(CG(active_op_array));
 			}
 		}
 
@@ -5227,7 +5229,7 @@ void zend_compile_try(zend_ast *ast) /* {{{ */
 
 		opline = &CG(active_op_array)->opcodes[opnum_catch];
 		if (!is_last_catch) {
-			opline->extended_value = get_next_op_number(CG(active_op_array));
+			opline->op2.opline_num = get_next_op_number(CG(active_op_array));
 		}
 	}
 
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 228111e29e..d787a92a7f 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -877,6 +877,8 @@ void zend_assert_valid_class_name(const zend_string *const_name);
 
 #define ZEND_FETCH_ARG_MASK         0x0fffffff
 
+#define ZEND_LAST_CATCH			    0x00000001
+
 #define ZEND_FREE_ON_RETURN     (1<<0)
 
 #define ZEND_SEND_BY_VAL     0
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index a0301a9add..41b40a2663 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -657,12 +657,16 @@ ZEND_API int pass_two(zend_op_array *op_array)
 			}
 			case ZEND_DECLARE_ANON_CLASS:
 			case ZEND_DECLARE_ANON_INHERITED_CLASS:
-			case ZEND_CATCH:
 			case ZEND_FE_FETCH_R:
 			case ZEND_FE_FETCH_RW:
 				/* absolute index to relative offset */
 				opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value);
 				break;
+			case ZEND_CATCH:
+				if (opline->extended_value != ZEND_LAST_CATCH) {
+					ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op2);
+				}
+				break;
 			case ZEND_RETURN:
 			case ZEND_RETURN_BY_REF:
 				if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a7fa49c433..979b4f6c06 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4082,7 +4082,7 @@ ZEND_VM_HANDLER(108, ZEND_THROW, CONST|TMP|VAR|CV, ANY)
 	HANDLE_EXCEPTION();
 }
 
-ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV, JMP_ADDR)
+ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, JMP_ADDR, LAST_CATCH)
 {
 	USE_OPLINE
 	zend_class_entry *ce, *catch_ce;
@@ -4093,7 +4093,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV, JMP_ADDR)
 	/* Check whether an exception has been thrown, if not, jump over code */
 	zend_exception_restore();
 	if (EG(exception) == NULL) {
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+		ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 		ZEND_VM_CONTINUE();
 	}
 	catch_ce = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)));
@@ -4112,17 +4112,17 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV, JMP_ADDR)
 
 	if (ce != catch_ce) {
 		if (!catch_ce || !instanceof_function(ce, catch_ce)) {
-			if (opline->result.num) {
+			if (opline->extended_value == ZEND_LAST_CATCH) {
 				zend_rethrow_exception(execute_data);
 				HANDLE_EXCEPTION();
 			}
-			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
+			ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
 			ZEND_VM_CONTINUE();
 		}
 	}
 
 	exception = EG(exception);
-	ex = EX_VAR(opline->op2.var);
+	ex = EX_VAR(opline->result.var);
 	if (UNEXPECTED(Z_ISREF_P(ex))) {
 		ex = Z_REFVAL_P(ex);
 	}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 1277156fdf..a26a4b6e5a 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2904,6 +2904,61 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_THROW_SPEC_CONST_HANDLER(ZEND_
 	HANDLE_EXCEPTION();
 }
 
+static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
+{
+	USE_OPLINE
+	zend_class_entry *ce, *catch_ce;
+	zend_object *exception;
+	zval *ex;
+
+	SAVE_OPLINE();
+	/* Check whether an exception has been thrown, if not, jump over code */
+	zend_exception_restore();
+	if (EG(exception) == NULL) {
+		ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
+		ZEND_VM_CONTINUE();
+	}
+	catch_ce = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)));
+	if (UNEXPECTED(catch_ce == NULL)) {
+		catch_ce = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), RT_CONSTANT(opline, opline->op1) + 1, ZEND_FETCH_CLASS_NO_AUTOLOAD);
+
+		CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)), catch_ce);
+	}
+	ce = EG(exception)->ce;
+
+#ifdef HAVE_DTRACE
+	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
+		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
+	}
+#endif /* HAVE_DTRACE */
+
+	if (ce != catch_ce) {
+		if (!catch_ce || !instanceof_function(ce, catch_ce)) {
+			if (opline->extended_value == ZEND_LAST_CATCH) {
+				zend_rethrow_exception(execute_data);
+				HANDLE_EXCEPTION();
+			}
+			ZEND_VM_SET_OPCODE(OP_JMP_ADDR(opline, opline->op2));
+			ZEND_VM_CONTINUE();
+		}
+	}
+
+	exception = EG(exception);
+	ex = EX_VAR(opline->result.var);
+	if (UNEXPECTED(Z_ISREF_P(ex))) {
+		ex = Z_REFVAL_P(ex);
+	}
+	zval_ptr_dtor(ex);
+	ZVAL_OBJ(ex, EG(exception));
+	if (UNEXPECTED(EG(exception) != exception)) {
+		GC_ADDREF(EG(exception));
+		HANDLE_EXCEPTION();
+	} else {
+		EG(exception) = NULL;
+		ZEND_VM_NEXT_OPCODE();
+	}
+}
+
 static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 	USE_OPLINE
@@ -10768,61 +10823,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_USER_CALL_SPEC_CONST_CV_H
 	ZEND_VM_NEXT_OPCODE();
 }
 
-static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-	USE_OPLINE
-	zend_class_entry *ce, *catch_ce;
-	zend_object *exception;
-	zval *ex;
-
-	SAVE_OPLINE();
-	/* Check whether an exception has been thrown, if not, jump over code */
-	zend_exception_restore();
-	if (EG(exception) == NULL) {
-		ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-		ZEND_VM_CONTINUE();
-	}
-	catch_ce = CACHED_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)));
-	if (UNEXPECTED(catch_ce == NULL)) {
-		catch_ce = zend_fetch_class_by_name(Z_STR_P(RT_CONSTANT(opline, opline->op1)), RT_CONSTANT(opline, opline->op1) + 1, ZEND_FETCH_CLASS_NO_AUTOLOAD);
-
-		CACHE_PTR(Z_CACHE_SLOT_P(RT_CONSTANT(opline, opline->op1)), catch_ce);
-	}
-	ce = EG(exception)->ce;
-
-#ifdef HAVE_DTRACE
-	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
-	}
-#endif /* HAVE_DTRACE */
-
-	if (ce != catch_ce) {
-		if (!catch_ce || !instanceof_function(ce, catch_ce)) {
-			if (opline->result.num) {
-				zend_rethrow_exception(execute_data);
-				HANDLE_EXCEPTION();
-			}
-			ZEND_VM_SET_RELATIVE_OPCODE(opline, opline->extended_value);
-			ZEND_VM_CONTINUE();
-		}
-	}
-
-	exception = EG(exception);
-	ex = EX_VAR(opline->op2.var);
-	if (UNEXPECTED(Z_ISREF_P(ex))) {
-		ex = Z_REFVAL_P(ex);
-	}
-	zval_ptr_dtor(ex);
-	ZVAL_OBJ(ex, EG(exception));
-	if (UNEXPECTED(EG(exception) != exception)) {
-		GC_ADDREF(EG(exception));
-		HANDLE_EXCEPTION();
-	} else {
-		EG(exception) = NULL;
-		ZEND_VM_NEXT_OPCODE();
-	}
-}
-
 static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
 	USE_OPLINE
@@ -54885,7 +54885,7 @@ ZEND_API void execute_ex(zend_execute_data *ex)
 			(void*)&&ZEND_EXT_NOP_SPEC_LABEL,
 			(void*)&&ZEND_TICKS_SPEC_LABEL,
 			(void*)&&ZEND_SEND_VAR_NO_REF_SPEC_VAR_LABEL,
-			(void*)&&ZEND_CATCH_SPEC_CONST_CV_LABEL,
+			(void*)&&ZEND_CATCH_SPEC_CONST_LABEL,
 			(void*)&&ZEND_THROW_SPEC_CONST_LABEL,
 			(void*)&&ZEND_THROW_SPEC_TMP_LABEL,
 			(void*)&&ZEND_THROW_SPEC_VAR_LABEL,
@@ -57012,6 +57012,9 @@ ZEND_API void execute_ex(zend_execute_data *ex)
 			HYBRID_CASE(ZEND_THROW_SPEC_CONST):
 				ZEND_THROW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 				HYBRID_BREAK();
+			HYBRID_CASE(ZEND_CATCH_SPEC_CONST):
+				ZEND_CATCH_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
+				HYBRID_BREAK();
 			HYBRID_CASE(ZEND_SEND_VAL_SPEC_CONST):
 				ZEND_SEND_VAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 				HYBRID_BREAK();
@@ -57525,9 +57528,6 @@ ZEND_API void execute_ex(zend_execute_data *ex)
 			HYBRID_CASE(ZEND_INIT_USER_CALL_SPEC_CONST_CV):
 				ZEND_INIT_USER_CALL_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 				HYBRID_BREAK();
-			HYBRID_CASE(ZEND_CATCH_SPEC_CONST_CV):
-				ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
-				HYBRID_BREAK();
 			HYBRID_CASE(ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV):
 				ZEND_ADD_ARRAY_ELEMENT_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
 				HYBRID_BREAK();
@@ -62770,7 +62770,7 @@ void zend_init_opcodes_handlers(void)
 		ZEND_EXT_NOP_SPEC_HANDLER,
 		ZEND_TICKS_SPEC_HANDLER,
 		ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDLER,
-		ZEND_CATCH_SPEC_CONST_CV_HANDLER,
+		ZEND_CATCH_SPEC_CONST_HANDLER,
 		ZEND_THROW_SPEC_CONST_HANDLER,
 		ZEND_THROW_SPEC_TMP_HANDLER,
 		ZEND_THROW_SPEC_VAR_HANDLER,
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 75afa99624..2c392b8760 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -78,7 +78,7 @@ $vm_op_flags = array(
 	"ZEND_VM_EXT_REF"         => 1<<20,
 	"ZEND_VM_EXT_MASK"        => 0x0f000000,
 	"ZEND_VM_EXT_NUM"         => 0x01000000,
-    // unused 0x2000000
+	"ZEND_VM_EXT_LAST_CATCH"  => 0x02000000,
 	"ZEND_VM_EXT_JMP_ADDR"    => 0x03000000,
 	"ZEND_VM_EXT_DIM_OBJ"     => 0x04000000,
     // unused 0x5000000
@@ -119,6 +119,7 @@ $vm_op_decode = array(
 
 $vm_ext_decode = array(
 	"NUM"                  => ZEND_VM_EXT_NUM,
+	"LAST_CATCH"           => ZEND_VM_EXT_LAST_CATCH,
 	"JMP_ADDR"             => ZEND_VM_EXT_JMP_ADDR,
 	"DIM_OBJ"              => ZEND_VM_EXT_DIM_OBJ,
 	"VAR_FETCH"            => ZEND_VM_EXT_VAR_FETCH,
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index 876dfef315..b01d7395d3 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -331,7 +331,7 @@ static uint32_t zend_vm_opcodes_flags[199] = {
 	0x00000000,
 	0x01000000,
 	0x00001001,
-	0x03000103,
+	0x02002003,
 	0x00000003,
 	0x00000771,
 	0x00000057,
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
index a1191cac29..fc0cba498f 100644
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@ -55,6 +55,7 @@
 #define ZEND_VM_EXT_REF          0x00100000
 #define ZEND_VM_EXT_MASK         0x0f000000
 #define ZEND_VM_EXT_NUM          0x01000000
+#define ZEND_VM_EXT_LAST_CATCH   0x02000000
 #define ZEND_VM_EXT_JMP_ADDR     0x03000000
 #define ZEND_VM_EXT_DIM_OBJ      0x04000000
 #define ZEND_VM_EXT_TYPE         0x07000000