Remove last E_ERROR in zend_vm_def.h

nikic · nikic · commit f6580f76cf06 · 2013-10-22T21:20:20.000+02:00
After further considertion simply throwing an exception is safe
here.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2116,7 +2116,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 		if (EXPECTED(EX(object) != NULL)) {
 			Z_OBJ_HT_P(EX(object))->call_method(fbc->common.function_name, opline->extended_value, EX_T(opline->result.var).var.ptr, &EX_T(opline->result.var).var.ptr, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
 		} else {
-			zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object");
+			zend_throw_engine_exception("Cannot call overloaded function for non-object" TSRMLS_CC);
 		}
 
 		if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -610,7 +610,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 		if (EXPECTED(EX(object) != NULL)) {
 			Z_OBJ_HT_P(EX(object))->call_method(fbc->common.function_name, opline->extended_value, EX_T(opline->result.var).var.ptr, &EX_T(opline->result.var).var.ptr, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
 		} else {
-			zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object");
+			zend_throw_engine_exception("Cannot call overloaded function for non-object" TSRMLS_CC);
 		}
 
 		if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {

Original file line number	Diff line number	Diff line change
`@@ -2116,7 +2116,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)`
`2116`	`2116`	`if (EXPECTED(EX(object) != NULL)) {`
`2117`	`2117`	`Z_OBJ_HT_P(EX(object))->call_method(fbc->common.function_name, opline->extended_value, EX_T(opline->result.var).var.ptr, &EX_T(opline->result.var).var.ptr, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);`
`2118`	`2118`	`} else {`
`2119`		`- zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object");`
	`2119`	`+ zend_throw_engine_exception("Cannot call overloaded function for non-object" TSRMLS_CC);`
`2120`	`2120`	`}`
`2121`	`2121`
`2122`	`2122`	`if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {`
Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR`
`610`	`610`	`if (EXPECTED(EX(object) != NULL)) {`
`611`	`611`	`Z_OBJ_HT_P(EX(object))->call_method(fbc->common.function_name, opline->extended_value, EX_T(opline->result.var).var.ptr, &EX_T(opline->result.var).var.ptr, EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);`
`612`	`612`	`} else {`
`613`		`- zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object");`
	`613`	`+ zend_throw_engine_exception("Cannot call overloaded function for non-object" TSRMLS_CC);`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {`