com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_v m_def.h Zend/zend_vm_execute.h

From: Date: Tue, 23 Apr 2013 19:59:00 +0000
Subject: com php-src: Merge branch 'PHP-5.4' into PHP-5.5: Zend/zend_v m_def.h Zend/zend_vm_execute.h
Groups: php.cvs 
Request: Send a blank email to [email protected] to get a copy of this message 
Commit:    758b666c0ad6edb48274858d2e11c53460787b88
Author:    Dmitry Stogov <[email protected]>         Tue, 23 Apr 2013 23:59:00 +0400
Parents:   2005a15caa36bc7974959885f837b9a3ebb78380 43ab915b41bbb236ca0aa1966c946c9c36fa2a2b
Branches:  PHP-5.5 master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=758b666c0ad6edb48274858d2e11c53460787b88

Log:
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

Changed paths:
  MM  Zend/zend_vm_def.h
  MM  Zend/zend_vm_execute.h


Diff:
diff --cc Zend/zend_vm_def.h
index 42a9c74,eed65e3..386641a
--- 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 23c89d1,18b3f47..916a6ff
--- 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);
  	}

Thread (1 message)

  • Dmitry Stogov
« previous php.cvs (#71988) next »