com php-src: Revert "re-generate zend_vm_execute.h": Zend/zend_vm_execute.h
| From: | Xinchen Hui | Date: | Tue, 28 Jul 2015 06:54:12 +0000 |
| Subject: | com php-src: Revert "re-generate zend_vm_execute.h": Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88195@lists.php.net to get a copy of this message | ||
Commit: ef04c5c584d7eb7b0c9cdc7219945120d0192589
Author: Xinchen Hui <laruence@php.net> Tue, 28 Jul 2015 14:54:12 +0800
Parents: 4b6d4a12145bf5cbf862b524078596db99cfec06
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ef04c5c584d7eb7b0c9cdc7219945120d0192589
Log:
Revert "re-generate zend_vm_execute.h"
This reverts commit 4b6d4a12145bf5cbf862b524078596db99cfec06.
Changed paths:
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f96ba8b..3f800b1 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -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();
}
}