Throw exception will override EX(opline)

laruence · laruence · commit 1c3b99c4ff20 · 2015-04-20T11:58:23.000+08:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end):
 		ZEND_VM_RETURN();
 	}
 
-	LOAD_OPLINE();
+	opline = EX(opline);
 
 	if (object) {
 		OBJ_RELEASE(object);
@@ -7866,8 +7866,8 @@ ZEND_VM_C_LABEL(call_trampoline_end):
 
 	if (UNEXPECTED(EG(exception) != NULL)) {
 		zend_throw_exception_internal(NULL);
-		if (RETURN_VALUE_USED(OPLINE)) {
-			zval_ptr_dtor(EX_VAR(OPLINE->result.var));
+		if (RETURN_VALUE_USED(opline)) {
+			zval_ptr_dtor(EX_VAR(opline->result.var));
 		}
 		HANDLE_EXCEPTION_LEAVE();
 	}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1893,7 +1893,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
 		ZEND_VM_RETURN();
 	}
 
-	LOAD_OPLINE();
+	opline = EX(opline);
 
 	if (object) {
 		OBJ_RELEASE(object);
@@ -1902,8 +1902,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
 
 	if (UNEXPECTED(EG(exception) != NULL)) {
 		zend_throw_exception_internal(NULL);
-		if (RETURN_VALUE_USED(OPLINE)) {
-			zval_ptr_dtor(EX_VAR(OPLINE->result.var));
+		if (RETURN_VALUE_USED(opline)) {
+			zval_ptr_dtor(EX_VAR(opline->result.var));
 		}
 		HANDLE_EXCEPTION_LEAVE();
 	}

Original file line number	Diff line number	Diff line change
`@@ -7857,7 +7857,7 @@ ZEND_VM_C_LABEL(call_trampoline_end):`
`7857`	`7857`	`ZEND_VM_RETURN();`
`7858`	`7858`	`}`
`7859`	`7859`
`7860`		`- LOAD_OPLINE();`
	`7860`	`+ opline = EX(opline);`
`7861`	`7861`
`7862`	`7862`	`if (object) {`
`7863`	`7863`	`OBJ_RELEASE(object);`
`@@ -7866,8 +7866,8 @@ ZEND_VM_C_LABEL(call_trampoline_end):`
`7866`	`7866`
`7867`	`7867`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`7868`	`7868`	`zend_throw_exception_internal(NULL);`
`7869`		`- if (RETURN_VALUE_USED(OPLINE)) {`
`7870`		`- zval_ptr_dtor(EX_VAR(OPLINE->result.var));`
	`7869`	`+ if (RETURN_VALUE_USED(opline)) {`
	`7870`	`+ zval_ptr_dtor(EX_VAR(opline->result.var));`
`7871`	`7871`	`}`
`7872`	`7872`	`HANDLE_EXCEPTION_LEAVE();`
`7873`	`7873`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1893,7 +1893,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z`
`1893`	`1893`	`ZEND_VM_RETURN();`
`1894`	`1894`	`}`
`1895`	`1895`
`1896`		`- LOAD_OPLINE();`
	`1896`	`+ opline = EX(opline);`
`1897`	`1897`
`1898`	`1898`	`if (object) {`
`1899`	`1899`	`OBJ_RELEASE(object);`
`@@ -1902,8 +1902,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z`
`1902`	`1902`
`1903`	`1903`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1904`	`1904`	`zend_throw_exception_internal(NULL);`
`1905`		`- if (RETURN_VALUE_USED(OPLINE)) {`
`1906`		`- zval_ptr_dtor(EX_VAR(OPLINE->result.var));`
	`1905`	`+ if (RETURN_VALUE_USED(opline)) {`
	`1906`	`+ zval_ptr_dtor(EX_VAR(opline->result.var));`
`1907`	`1907`	`}`
`1908`	`1908`	`HANDLE_EXCEPTION_LEAVE();`
`1909`	`1909`	`}`