Unused ret

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 69a73467fa6c23c2a06a04e1a29f7660cdbcc213..133a1d11a457c00058571fb16a12650ed96bbf8d 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -398,7 +398,9 @@ ZEND_API void execute_ex(zend_execute_data *ex)
        LOAD_OPLINE();
 
        while (1) {
+#if !defined(ZEND_VM_FP_GLOBAL_REG) || !defined(ZEND_VM_IP_GLOBAL_REG)
        int ret;
+#endif
 #if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)
                ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
                if (UNEXPECTED(!OPLINE)) {

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index c57cbad35889d8d88ea1c3404c2fbf6c495d46fe..316eb55a11c54d6a7982c448f699fc8d41359c50 100644 (file)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1185,7 +1185,9 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
                                case "ZEND_VM_CONTINUE_LABEL":
                                        if ($kind == ZEND_VM_KIND_CALL) {
                                          // Only SWITCH dispatch method use it
+                                               out($f,"#if !defined(ZEND_VM_FP_GLOBAL_REG) || !defined(ZEND_VM_IP_GLOBAL_REG)\n");
                                                out($f,$m[1]."\tint ret;".$m[3]."\n");
+                                               out($f,"#endif\n");
                                        } else if ($kind == ZEND_VM_KIND_SWITCH) {
                                          // Only SWITCH dispatch method use it
                                                out($f,"zend_vm_continue:".$m[3]."\n");