Exceptions triggered by undefined variable should be handled before FATAL error

this is a enhancement of the fix for bug #64135

diff --git a/Zend/tests/bug51394.phpt b/Zend/tests/bug51394.phpt
index 406de13a9bf8be8e8fedb195c3f00bfbfaacf7ef..b0dddffaf82f341ef8b6d0047015e4f85a88e3e8 100644 (file)
--- a/Zend/tests/bug51394.phpt
+++ b/Zend/tests/bug51394.phpt
@@ -13,10 +13,8 @@ function eh()
 set_error_handler("eh");
 $a = $empty($b);
 --EXPECTF--
-Warning: Uncaught exception 'Exception' with message 'error!' in %sbug51394.php:4
+Fatal error: Uncaught exception 'Exception' with message 'error!' in %sbug51394.php:%d
 Stack trace:
-#0 %sbug51394.php(9): eh(8, 'Undefined varia...', '%s', 9, Array)
+#0 %sbug51394.php(%d): eh(8, 'Undefined varia%s', '%s', %d, Array)
 #1 {main}
-  thrown in %sbug51394.php on line 4
-
-Fatal error: Function name must be a string in %sbug51394.php on line 9
\ No newline at end of file
+  thrown in %sbug51394.php on line %d

diff --git a/Zend/tests/exception_before_fatal.phpt b/Zend/tests/exception_before_fatal.phpt
new file mode 100644 (file)
index 0000000..608d650
--- /dev/null
+++ b/Zend/tests/exception_before_fatal.phpt
@@ -0,0 +1,64 @@
+--TEST--
+Exceptions before fatal error
+--FILE--
+<?php
+function exception_error_handler($code, $msg) {
+    throw new Exception($msg);
+}
+
+set_error_handler("exception_error_handler");
+
+try {
+    $foo->a();
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+
+try {
+    new $foo();
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+
+try {
+    throw $foo;
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+
+try {
+    $foo();
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+
+try {
+    $foo::b();
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+
+
+try {
+    $b = clone $foo;
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+
+class b {
+}
+
+try {
+    b::$foo();
+} catch(Exception $e) {
+    var_dump($e->getMessage());
+}
+?>
+--EXPECT--
+string(23) "Undefined variable: foo"
+string(23) "Undefined variable: foo"
+string(23) "Undefined variable: foo"
+string(23) "Undefined variable: foo"
+string(23) "Undefined variable: foo"
+string(23) "Undefined variable: foo"
+string(23) "Undefined variable: foo"

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index cbd3810a2103558e05cb0b5c77e8a1a5f1389eb5..91eb8a6fdef1d1603e2a647e9d2d9c4dd4e8eae4 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2405,6 +2405,9 @@ ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMP|VAR|UNUSED|CV)
                } else if (Z_TYPE_P(class_name) == IS_STRING) {
                        EX_T(opline->result.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
                }
 
@@ -2429,6 +2432,9 @@ ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 
        if (OP2_TYPE != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -2544,6 +2550,9 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMP|VAR|UNUS
                        function_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -2747,6 +2756,9 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Function name must be a string");
                        ZEND_VM_NEXT_OPCODE(); /* Never reached */
                }
@@ -2959,8 +2971,12 @@ ZEND_VM_HANDLER(108, ZEND_THROW, CONST|TMP|VAR|CV, ANY)
        value = GET_OP1_ZVAL_PTR(BP_VAR_R);
 
        if (OP1_TYPE == IS_CONST || UNEXPECTED(Z_TYPE_P(value) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Can only throw objects");
        }
+
        zend_exception_save(TSRMLS_C);
        /* Not sure if a complete copy is what we want here */
        ALLOC_ZVAL(exception);
@@ -3423,6 +3439,9 @@ ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY)
 
        if (OP1_TYPE == IS_CONST ||
            UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "__clone method called on non-object");
        }
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7b874decef28db026ff2b992b53e19d5fb783b4e..62bcdf7fd2e0bc50791d0440857bb97271cb49ce 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1191,6 +1191,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLE
                } else if (Z_TYPE_P(class_name) == IS_STRING) {
                        EX_T(opline->result.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
                }
 
@@ -1336,6 +1339,9 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Function name must be a string");
                        ZEND_VM_NEXT_OPCODE(); /* Never reached */
                }
@@ -1511,6 +1517,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_
                } else if (Z_TYPE_P(class_name) == IS_STRING) {
                        EX_T(opline->result.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
                }
 
@@ -1657,6 +1666,9 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Function name must be a string");
                        ZEND_VM_NEXT_OPCODE(); /* Never reached */
                }
@@ -1692,6 +1704,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_
                } else if (Z_TYPE_P(class_name) == IS_STRING) {
                        EX_T(opline->result.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
                }
 
@@ -1838,6 +1853,9 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Function name must be a string");
                        ZEND_VM_NEXT_OPCODE(); /* Never reached */
                }
@@ -1873,6 +1891,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDL
                } else if (Z_TYPE_P(class_name) == IS_STRING) {
                        EX_T(opline->result.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
                }
 
@@ -1909,6 +1930,9 @@ static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_A
                } else if (Z_TYPE_P(class_name) == IS_STRING) {
                        EX_T(opline->result.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), opline->extended_value TSRMLS_CC);
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
                }
 
@@ -2054,6 +2078,9 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else {
+                       if (UNEXPECTED(EG(exception) != NULL)) {
+                               HANDLE_EXCEPTION();
+                       }
                        zend_error_noreturn(E_ERROR, "Function name must be a string");
                        ZEND_VM_NEXT_OPCODE(); /* Never reached */
                }
@@ -2425,8 +2452,12 @@ static int ZEND_FASTCALL  ZEND_THROW_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
        value = opline->op1.zv;
 
        if (IS_CONST == IS_CONST || UNEXPECTED(Z_TYPE_P(value) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Can only throw objects");
        }
+
        zend_exception_save(TSRMLS_C);
        /* Not sure if a complete copy is what we want here */
        ALLOC_ZVAL(exception);
@@ -2497,6 +2528,9 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 
        if (IS_CONST == IS_CONST ||
            UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "__clone method called on non-object");
        }
 
@@ -3553,6 +3587,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER(
                        function_name = opline->op2.zv;
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -4543,6 +4580,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE
                        function_name = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -5402,6 +5442,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE
                        function_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -6117,6 +6160,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER
                        function_name = NULL;
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -6973,6 +7019,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN
                        function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -7724,8 +7773,12 @@ static int ZEND_FASTCALL  ZEND_THROW_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        value = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
        if (IS_TMP_VAR == IS_CONST || UNEXPECTED(Z_TYPE_P(value) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Can only throw objects");
        }
+
        zend_exception_save(TSRMLS_C);
        /* Not sure if a complete copy is what we want here */
        ALLOC_ZVAL(exception);
@@ -7797,6 +7850,9 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (IS_TMP_VAR == IS_CONST ||
            UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "__clone method called on non-object");
        }
 
@@ -8914,6 +8970,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO
 
        if (IS_CONST != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -9772,6 +9831,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE
 
        if (IS_TMP_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -10635,6 +10697,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE
 
        if (IS_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -12073,6 +12138,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_
 
        if (IS_CV != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -12940,8 +13008,12 @@ static int ZEND_FASTCALL  ZEND_THROW_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        value = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC);
 
        if (IS_VAR == IS_CONST || UNEXPECTED(Z_TYPE_P(value) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Can only throw objects");
        }
+
        zend_exception_save(TSRMLS_C);
        /* Not sure if a complete copy is what we want here */
        ALLOC_ZVAL(exception);
@@ -13122,6 +13194,9 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (IS_VAR == IS_CONST ||
            UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "__clone method called on non-object");
        }
 
@@ -15302,6 +15377,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO
 
        if (IS_CONST != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -15416,6 +15494,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE
                        function_name = opline->op2.zv;
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -17647,6 +17728,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE
 
        if (IS_TMP_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -17762,6 +17846,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND
                        function_name = _get_zval_ptr_tmp(opline->op2.var, execute_data, &free_op2 TSRMLS_CC);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -19957,6 +20044,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE
 
        if (IS_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -20072,6 +20162,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND
                        function_name = _get_zval_ptr_var(opline->op2.var, execute_data, &free_op2 TSRMLS_CC);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -21506,6 +21599,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z
                        function_name = NULL;
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -23402,6 +23498,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_
 
        if (IS_CV != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -23516,6 +23615,9 @@ static int ZEND_FASTCALL  ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_
                        function_name = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op2.var TSRMLS_CC);
 
                        if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+                               if (UNEXPECTED(EG(exception) != NULL)) {
+                                       HANDLE_EXCEPTION();
+                               }
                                zend_error_noreturn(E_ERROR, "Function name must be a string");
                        } else {
                                function_name_strval = Z_STRVAL_P(function_name);
@@ -24163,6 +24265,9 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARG
 
        if (IS_UNUSED == IS_CONST ||
            UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "__clone method called on non-object");
        }
 
@@ -25032,6 +25137,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O
 
        if (IS_CONST != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -26444,6 +26552,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC
 
        if (IS_TMP_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -27762,6 +27873,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC
 
        if (IS_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -29501,6 +29615,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO
 
        if (IS_CV != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -30536,8 +30653,12 @@ static int ZEND_FASTCALL  ZEND_THROW_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        value = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC);
 
        if (IS_CV == IS_CONST || UNEXPECTED(Z_TYPE_P(value) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Can only throw objects");
        }
+
        zend_exception_save(TSRMLS_C);
        /* Not sure if a complete copy is what we want here */
        ALLOC_ZVAL(exception);
@@ -30706,6 +30827,9 @@ static int ZEND_FASTCALL  ZEND_CLONE_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
        if (IS_CV == IS_CONST ||
            UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "__clone method called on non-object");
        }
 
@@ -32733,6 +32857,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD
 
        if (IS_CONST != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -34850,6 +34977,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_
 
        if (IS_TMP_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -37026,6 +37156,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_
 
        if (IS_VAR != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }
 
@@ -40194,6 +40327,9 @@ static int ZEND_FASTCALL  ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H
 
        if (IS_CV != IS_CONST &&
            UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
+               if (UNEXPECTED(EG(exception) != NULL)) {
+                       HANDLE_EXCEPTION();
+               }
                zend_error_noreturn(E_ERROR, "Method name must be a string");
        }