From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 22 Dec 2013 13:17:21 +0000 (+0000)
Subject: Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df9f2ad2e96e431232b30688d119eb23f38b7c76;p=php

Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
---

df9f2ad2e96e431232b30688d119eb23f38b7c76
diff --cc Zend/zend_vm_opcodes.c
index 22fc7cbcf3,04af26cdb4..177c3fd02e
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -19,9 -19,8 +19,9 @@@
  */
  
  #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,8 -185,5 +186,9 @@@
  	"ZEND_GENERATOR_RETURN",
  	"ZEND_FAST_CALL",
  	"ZEND_FAST_RET",
+ 	"ZEND_RECV_VARIADIC",
  };
 +
 +ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {
 +	return zend_vm_opcodes_map[opcode];
 +}