Fixed "zend_vm_gen.php --without-specializer"

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index c63a337eb997003e3d76a894cc6a6d3f56b501bf..85ecccbc858c6c2bd47845bd3ddaf927cddc9c15 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3414,8 +3414,8 @@ ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|C
 
 ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY)
 {
+       zend_op *opline = EX(opline);
        if (OP1_TYPE != IS_UNUSED) {
-               zend_op *opline = EX(opline);
                zend_free_op free_op1;
                zval *ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 78c0c6bdaacd03bed34f86e3a4ac14eaef992d7b..cf9e1100d5d97b091289c44feebb777d259a0c76 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2187,8 +2187,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+       zend_op *opline = EX(opline);
        if (IS_CONST != IS_UNUSED) {
-               zend_op *opline = EX(opline);
                
                zval *ptr = &opline->op1.u.constant;
 
@@ -4606,8 +4606,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+       zend_op *opline = EX(opline);
        if (IS_TMP_VAR != IS_UNUSED) {
-               zend_op *opline = EX(opline);
                zend_free_op free_op1;
                zval *ptr = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
 
@@ -7744,8 +7744,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+       zend_op *opline = EX(opline);
        if (IS_VAR != IS_UNUSED) {
-               zend_op *opline = EX(opline);
                zend_free_op free_op1;
                zval *ptr = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
 
@@ -14031,8 +14031,8 @@ static int ZEND_CLONE_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+       zend_op *opline = EX(opline);
        if (IS_UNUSED != IS_UNUSED) {
-               zend_op *opline = EX(opline);
                
                zval *ptr = NULL;
 
@@ -19702,8 +19702,8 @@ static int ZEND_ISSET_ISEMPTY_VAR_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 
 static int ZEND_EXIT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
+       zend_op *opline = EX(opline);
        if (IS_CV != IS_UNUSED) {
-               zend_op *opline = EX(opline);
                
                zval *ptr = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
 

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 1821ef4ecae59f59ec7d80b214d67df1c1abd5b6..b3134fe0ea1f6d64f95de01f0a1de868e5153ed0 100644 (file)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1200,13 +1200,13 @@ function gen_vm($def, $skel) {
                        if ($kind == "handler") {
                                $op = $opcodes[$opnames[$name]];
                                if (isset($op['op1']["ANY"]) && isset($op['op2']["ANY"])) {
-                                       out($f, "{\n\treturn ".$name."_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n");
+                                       out($f, "{\n\treturn ".$name.(ZEND_VM_SPEC?"_SPEC":"")."_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n");
                                        $done = 1;
                                }
                        } else if ($helpers[$name]["param"] == null) {
                                $h = $helpers[$name];
                                if (isset($h['op1']["ANY"]) && isset($h['op2']["ANY"])) {
-                                       out($f, "{\n\treturn ".$name."_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n");
+                                       out($f, "{\n\treturn ".$name.(ZEND_VM_SPEC?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n");
                                        $done = 1;
                                }
                        }