summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrakjoe <joe.watkins@live.co.uk>2013-12-22 13:17:21 +0000
committerkrakjoe <joe.watkins@live.co.uk>2013-12-22 13:17:21 +0000
commitdf9f2ad2e96e431232b30688d119eb23f38b7c76 (patch)
tree8a8ee8bb083ee5a7ba85ab6573d6e92c043b20f3
parent2a1b60569fda7b9ca949f557c617d2555014e9fd (diff)
parent9f1075bb29a2d27c67c2b74141e59bbfc259ae28 (diff)
downloadphp-git-df9f2ad2e96e431232b30688d119eb23f38b7c76.tar.gz
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
-rw-r--r--Zend/zend_vm_opcodes.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_vm_opcodes.c b/Zend/zend_vm_opcodes.c
index 22fc7cbcf3..177c3fd02e 100644
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <zend.h>
-const char *zend_vm_opcodes_map[164] = {
+const char *zend_vm_opcodes_map[165] = {
"ZEND_NOP",
"ZEND_ADD",
"ZEND_SUB",
@@ -186,6 +186,7 @@ const char *zend_vm_opcodes_map[164] = {
"ZEND_GENERATOR_RETURN",
"ZEND_FAST_CALL",
"ZEND_FAST_RET",
+ "ZEND_RECV_VARIADIC",
};
ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {