diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-24 09:44:55 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-24 09:44:55 +0200 |
| commit | 9e4603f7727b94409575886cda34fc2d2c4d6388 (patch) | |
| tree | 60efc9c3a424ecaa41fdc0a7483318bdc2cf0405 /Zend/zend_vm_gen.php | |
| parent | 8d51af9bc25a4ba8ab6d96cc4443cd9963719b96 (diff) | |
| download | php-git-9e4603f7727b94409575886cda34fc2d2c4d6388.tar.gz | |
Try to fix macos build
By avoiding unused variable opline warnings. Also clean up the
replacement of ZEND_VM_SPEC -- we were sometimes treating it as
an always-defined constant with a value (what it actually is) and
sometimes as a conditionally defined constant (which it isn't, but
which still worked thanks to the specializer). Switch to only
treating it as a constant with a value.
Diffstat (limited to 'Zend/zend_vm_gen.php')
| -rwxr-xr-x | Zend/zend_vm_gen.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index aacdead2de..a83f3e5891 100755 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -812,10 +812,8 @@ function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name, $extra_sp "/FREE_OP2_VAR_PTR\(\)/" => $op2_free_op_var_ptr[$op2], "/FREE_UNFETCHED_OP1\(\)/" => $op1_free_unfetched[$op1], "/FREE_UNFETCHED_OP2\(\)/" => $op2_free_unfetched[$op2], - "/^#(\s*)ifdef\s+ZEND_VM_SPEC\s*\n/m" => ($op1!="ANY"||$op2!="ANY")?"#\\1if 1\n":"#\\1if 0\n", - "/^#(\s*)ifndef\s+ZEND_VM_SPEC\s*\n/m" => ($op1!="ANY"||$op2!="ANY")?"#\\1if 0\n":"#\\1if 1\n", - "/\!defined\(ZEND_VM_SPEC\)/m" => ($op1!="ANY"||$op2!="ANY")?"0":"1", - "/defined\(ZEND_VM_SPEC\)/m" => ($op1!="ANY"||$op2!="ANY")?"1":"0", + "/\!ZEND_VM_SPEC/m" => ($op1!="ANY"||$op2!="ANY")?"0":"1", + "/ZEND_VM_SPEC/m" => ($op1!="ANY"||$op2!="ANY")?"1":"0", "/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m" => "\\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2].extra_spec_name($extra_spec)):""), "/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m" => "goto \\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2].extra_spec_name($extra_spec)):""), "/^#(\s*)if\s+1\s*\\|\\|.*[^\\\\]$/m" => "#\\1if 1", |