summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2018-12-21 18:58:50 +0300
committerDmitry Stogov <dmitry@zend.com>2018-12-21 18:58:50 +0300
commit8db63adb6df9727962f1f0498389f841866654a1 (patch)
tree1d2c5b2724f724413301ce5037cbf16c4d547239 /Zend
parent3245d1bb091a4a343c151fd22af68e41244c7d4a (diff)
downloadphp-git-8db63adb6df9727962f1f0498389f841866654a1.tar.gz
Removed /e modifirer and fixed ws.
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_vm_gen.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index d6dbf8393f..3cad2696d3 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -903,7 +903,7 @@ function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name, $extra_sp
}
/* Remove unused free_op1 and free_op2 declarations */
- if ($spec && preg_match_all('/^\s*zend_free_op\s+[^;]+;\s*$/me', $code, $matches, PREG_SET_ORDER)) {
+ if ($spec && preg_match_all('/^\s*zend_free_op\s+[^;]+;\s*$/m', $code, $matches, PREG_SET_ORDER)) {
$n = 0;
foreach ($matches as $match) {
$code = preg_replace('/'.preg_quote($match[0],'/').'/', "\$D$n", $code);
@@ -2383,6 +2383,7 @@ function gen_vm($def, $skel) {
// Generate specialized executor
gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_init_opcodes_handlers");
+ out($f, "\n");
// Generate zend_vm_get_opcode_handler() function
out($f, "static const void *zend_vm_get_opcode_handler_ex(uint32_t spec, const zend_op* op)\n");