From: Xinchen Hui <laruence@php.net>
Date: Sun, 28 Jun 2015 11:09:19 +0000 (+0800)
Subject: Unused ret
X-Git-Tag: php-7.1.0alpha3~25^2~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a486294e7d607e8886b5ca35216e33bf78a2b549;p=php

Unused ret
---

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 69a73467fa..133a1d11a4 100644
--- 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 c57cbad358..316eb55a11 100644
--- 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");