diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-08-27 19:10:29 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-08-27 19:10:29 +0400 |
| commit | 8ec40397cdedabcfedc09c8a43d8c4693875baed (patch) | |
| tree | f189a53a02cb6fb0f7e27eccebd425bbda4787e2 /Zend/zend_vm_gen.php | |
| parent | a79b9333848829d78580b1c7287539f319883631 (diff) | |
| download | php-git-8ec40397cdedabcfedc09c8a43d8c4693875baed.tar.gz | |
Cleanup IS_VAR handling
Diffstat (limited to 'Zend/zend_vm_gen.php')
| -rw-r--r-- | Zend/zend_vm_gen.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 50506f566b..a65963ce91 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -305,8 +305,6 @@ $op1_free_op_var_ptr = array( "UNUSED" => "", "CV" => "", ); -$op1_free_op_var_ptr_fast = $op1_free_op_var_ptr; -$op1_free_op_var_ptr_fast["VAR"] = "zval_ptr_dtor_nogc(free_op1.var)"; $op2_free_op_var_ptr = array( "ANY" => "if (free_op2.var) {zval_ptr_dtor_nogc(free_op2.var);}", @@ -316,8 +314,6 @@ $op2_free_op_var_ptr = array( "UNUSED" => "", "CV" => "", ); -$op2_free_op_var_ptr_fast = $op2_free_op_var_ptr; -$op2_free_op_var_ptr_fast["VAR"] = "zval_ptr_dtor_nogc(free_op2.var)"; $list = array(); // list of opcode handlers and helpers in original order $opcodes = array(); // opcode handlers by code @@ -372,8 +368,7 @@ function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name) { $op1_get_obj_zval_ptr_ptr, $op2_get_obj_zval_ptr_ptr, $op1_is_tmp_free, $op2_is_tmp_free, $op1_free, $op2_free, $op1_free_op, $op2_free_op, $op1_free_op_if_var, $op2_free_op_if_var, - $op1_free_op_var_ptr, $op2_free_op_var_ptr, $prefix, - $op1_free_op_var_ptr_fast, $op2_free_op_var_ptr_fast; + $op1_free_op_var_ptr, $op2_free_op_var_ptr, $prefix; // Specializing $code = preg_replace( @@ -404,8 +399,6 @@ function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name) { "/FREE_OP2_IF_VAR\(\)/", "/FREE_OP1_VAR_PTR\(\)/", "/FREE_OP2_VAR_PTR\(\)/", - "/FREE_OP1_VAR_PTR_FAST\(\)/", - "/FREE_OP2_VAR_PTR_FAST\(\)/", "/^#ifdef\s+ZEND_VM_SPEC\s*\n/m", "/^#ifndef\s+ZEND_VM_SPEC\s*\n/m", "/\!defined\(ZEND_VM_SPEC\)/m", @@ -444,8 +437,6 @@ function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name) { $op2_free_op_if_var[$op2], $op1_free_op_var_ptr[$op1], $op2_free_op_var_ptr[$op2], - $op1_free_op_var_ptr_fast[$op1], - $op2_free_op_var_ptr_fast[$op2], ($op1!="ANY"||$op2!="ANY")?"#if 1\n":"#if 0\n", ($op1!="ANY"||$op2!="ANY")?"#if 0\n":"#if 1\n", ($op1!="ANY"||$op2!="ANY")?"0":"1", |