From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 21 Dec 2018 16:01:36 +0000 (+0300)
Subject: Merge branch 'PHP-7.3'
X-Git-Tag: php-7.4.0alpha1~1364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7155239669b4609639d82ea42fa4b802b9f4618d;p=php

Merge branch 'PHP-7.3'

* PHP-7.3:
  Removed /e modifirer and fixed ws.
---

7155239669b4609639d82ea42fa4b802b9f4618d
diff --cc Zend/zend_vm_gen.php
index e396fe5d91,d708612c9d..7b43a28fb9
mode 100755,100644..100755
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@@ -2672,9 -2671,9 +2672,10 @@@ function gen_vm($def, $skel) 
  
  	// Generate specialized executor
  	gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_vm_init");
+ 	out($f, "\n");
  
  	// Generate zend_vm_get_opcode_handler() function
 +	out($f, "\n");
  	out($f, "static const void* ZEND_FASTCALL zend_vm_get_opcode_handler_ex(uint32_t spec, const zend_op* op)\n");
  	out($f, "{\n");
  	if (!ZEND_VM_SPEC) {