]> granicus.if.org Git - php/commitdiff
Revert "re-generate zend_vm_execute.h"
authorXinchen Hui <laruence@php.net>
Tue, 28 Jul 2015 06:54:12 +0000 (14:54 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 28 Jul 2015 06:54:12 +0000 (14:54 +0800)
This reverts commit 4b6d4a12145bf5cbf862b524078596db99cfec06.

Zend/zend_vm_execute.h

index f96ba8b58a7c1d55f58f0dcdaae95c79d925af58..3f800b120df9848a3253bf47a75a9fb2c43bfa04 100644 (file)
@@ -7673,8 +7673,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();
                }
        }
 
@@ -9404,8 +9404,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();
                }
        }
 
@@ -11208,8 +11208,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();
                }
        }
 
@@ -17543,8 +17543,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                        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();
                }
        }
 
@@ -19167,8 +19167,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                        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();
                }
        }
 
@@ -20768,8 +20768,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                        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();
                }
        }
 
@@ -22321,8 +22321,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V
                                        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();
                }
        }