Merge branch 'PHP-5.5'

dstogov · dstogov · commit 3067f54b2724 · 2012-12-06T13:20:49.000+04:00
* PHP-5.5:
  Generatirs are going to be used less than regular functions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1598,7 +1598,7 @@ static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array
 	 * restore it simply by replacing a pointer. The same segment also keeps
 	 * a copy of previous execute_data and passed parameters.
 	 */
-	if (op_array->fn_flags & ZEND_ACC_GENERATOR) {
+	if (UNEXPECTED((op_array->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
 		/* Prepend the regular stack frame with copy on prev_execute_data
 		 * and passed arguments
 		 */
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2049,7 +2049,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
 			ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
 		}
 
-		if (EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {
+		if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
 			if (RETURN_VALUE_USED(opline)) {
 				EX_T(opline->result.var).var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC);
 			}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -590,7 +590,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
 			ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;
 		}
 
-		if (EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {
+		if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
 			if (RETURN_VALUE_USED(opline)) {
 				EX_T(opline->result.var).var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC);
 			}

Original file line number	Diff line number	Diff line change
`@@ -2049,7 +2049,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)`
`2049`	`2049`	`ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;`
`2050`	`2050`	`}`
`2051`	`2051`
`2052`		`- if (EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {`
	`2052`	`+ if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {`
`2053`	`2053`	`if (RETURN_VALUE_USED(opline)) {`
`2054`	`2054`	`EX_T(opline->result.var).var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC);`
`2055`	`2055`	`}`
Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR`
`590`	`590`	`ret->var.fcall_returned_reference = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0;`
`591`	`591`	`}`
`592`	`592`
`593`		`- if (EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) {`
	`593`	`+ if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {`
`594`	`594`	`if (RETURN_VALUE_USED(opline)) {`
`595`	`595`	`EX_T(opline->result.var).var.ptr = zend_generator_create_zval(EG(active_op_array) TSRMLS_CC);`
`596`	`596`	`}`