Revert "Attempt to fix bug35437.phpt fails"

This reverts commit 16d6dfddef5ac43de3b20ffa7818d5b11f4e6a4b.

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 92733331171c91e922602ae3ce38ac848a2d98a3..ce5d520aa2d242678fb6b52120a3f9590f1b0a00 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3096,8 +3096,8 @@ ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, CONST|TMPVAR|UNUSE
                                        zend_ce_error,
                                        "Non-static method %s::%s() cannot be called statically",
                                        ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
+                               HANDLE_EXCEPTION();
                        }
-                       HANDLE_EXCEPTION();
                }
        }
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3f800b120df9848a3253bf47a75a9fb2c43bfa04..da2eeada1369d7731480fb8221b65180fb9cee7d 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5663,8 +5663,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C
                                        zend_ce_error,
                                        "Non-static method %s::%s() cannot be called statically",
                                        ZSTR_VAL(fbc->common.scope->name), ZSTR_VAL(fbc->common.function_name));
+                               HANDLE_EXCEPTION();
                        }
-                       HANDLE_EXCEPTION();
                }
        }