com php-src: Unused ret: Zend/zend_vm_execute.h Zend/ze nd_vm_gen.php

Commit: a486294e7d607e8886b5ca35216e33bf78a2b549 Author: Xinchen Hui <laruence@php.net> Sun, 28 Jun 2015 19:09:19 +0800 Parents: b81188518bc6018ad784492720558affeec7abf6 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a486294e7d607e8886b5ca35216e33bf78a2b549 Log: Unused ret Changed paths: M Zend/zend_vm_execute.h M Zend/zend_vm_gen.php Diff: diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 69a7346..133a1d1 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 c57cbad..316eb55 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");