com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h
| From: | Bob Weinand | Date: | Sat, 21 Dec 2013 20:31:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_v m_gen.php Zend/zend_vm_opcodes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75379@lists.php.net to get a copy of this message | ||
Commit: 560f90e5117b94bf16e6698e372e981d7bbb38e5
Author: Bob Weinand <bobwei9@hotmail.com> Sat, 21 Dec 2013 21:31:48 +0100
Parents: b52c300ecad2637732551b45f0819f2d7cb3ccf1 7894e397d83a1ecaddd06732171d5bf28c2265fb
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=560f90e5117b94bf16e6698e372e981d7bbb38e5
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.h
Changed paths:
MM Zend/zend_vm_gen.php
MM Zend/zend_vm_opcodes.h
Diff:
diff --cc Zend/zend_vm_opcodes.h
index 2ca7f84,51b513a..18bb0d2
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -162,13 -162,8 +162,13 @@@
#define ZEND_SEPARATE 156
#define ZEND_QM_ASSIGN_VAR 157
#define ZEND_JMP_SET_VAR 158
+#define ZEND_DISCARD_EXCEPTION 159
+#define ZEND_YIELD 160
+#define ZEND_GENERATOR_RETURN 161
+#define ZEND_FAST_CALL 162
+#define ZEND_FAST_RET 163
- const char *zend_vm_opcodes_map[] = {
+ static const char *zend_vm_opcodes_map[] = {
"ZEND_NOP",
"ZEND_ADD",
"ZEND_SUB",