From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 23 Apr 2013 19:59:00 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0beta4~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=758b666c0ad6edb48274858d2e11c53460787b88;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
---

758b666c0ad6edb48274858d2e11c53460787b88
diff --cc Zend/zend_vm_def.h
index 42a9c74737,eed65e3e27..386641a620
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -3168,7 -3140,9 +3168,9 @@@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|
  		ZEND_VM_NEXT_OPCODE();
  	}
  
- 	if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, opline->op2.opline_num)) {
+ 	if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
+ 	    EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
 -	    !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
++	    !ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, opline->op2.opline_num)) {
  		ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
  	}
  
diff --cc Zend/zend_vm_execute.h
index 23c89d1258,18b3f4772c..916a6ffe5c
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -13089,7 -11171,9 +13089,9 @@@ static int ZEND_FASTCALL  ZEND_SEND_REF
  		ZEND_VM_NEXT_OPCODE();
  	}
  
- 	if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, opline->op2.opline_num)) {
+ 	if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
+ 	    EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
 -	    !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
++	    !ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, opline->op2.opline_num)) {
  		return zend_send_by_var_helper_SPEC_VAR(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
  	}
  
@@@ -30710,7 -27125,9 +30712,9 @@@ static int ZEND_FASTCALL  ZEND_SEND_REF
  		ZEND_VM_NEXT_OPCODE();
  	}
  
- 	if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, opline->op2.opline_num)) {
+ 	if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
+ 	    EX(function_state).function->type == ZEND_INTERNAL_FUNCTION &&
 -	    !ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.opline_num)) {
++	    !ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, opline->op2.opline_num)) {
  		return zend_send_by_var_helper_SPEC_CV(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
  	}