From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 21 Dec 2013 20:31:48 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=560f90e5117b94bf16e6698e372e981d7bbb38e5;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_gen.php
	Zend/zend_vm_opcodes.h
---

560f90e5117b94bf16e6698e372e981d7bbb38e5
diff --cc Zend/zend_vm_opcodes.h
index 2ca7f84c5c,51b513a56d..18bb0d27f7
--- 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",