Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport

* origin/PHP-5.6:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark

Author: weltling

Zend/zend_operators.c

@@ -962,7 +962,7 @@ ZEND_API int mul_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ *
 }
 /* }}} */
 
-ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
+ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
 {
 	zval op1_copy, op2_copy;
 	int converted = 0;
@@ -1044,6 +1044,7 @@ ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
 		}
 	}
 }
+/* }}} */
 
 ZEND_API int div_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* {{{ */
 {

ext/opcache/Optimizer/zend_optimizer.c

@@ -367,20 +367,41 @@ static void replace_tmp_by_const(zend_op_array *op_array,
 		if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR &&
 			ZEND_OP1(opline).var == var) {
 
-			update_op1_const(op_array, opline, val TSRMLS_CC);
-			/* TMP_VAR my be used only once */
-			break;
+			/* In most cases IS_TMP_VAR operand may be used only once.
+			 * The operands are usually destroyed by the opcode handler.
+			 * ZEND_CASE is an exception, that keeps operand unchanged,
+			 * and allows its reuse. The number of ZEND_CASE instructions
+			 * usually terminated by ZEND_FREE that finally kills the value.
+			 */
+			if (opline->opcode == ZEND_CASE) {
+				zval old_val;
+				old_val = *val;
+				zval_copy_ctor(val);
+				update_op1_const(op_array, opline, val TSRMLS_CC);
+				*val = old_val;
+			} else if (opline->opcode == ZEND_FREE) {
+				MAKE_NOP(opline);
+				break;
+			} else {				
+				update_op1_const(op_array, opline, val TSRMLS_CC);
+				val = NULL;
+				break;
+			}
 		}
 
 		if (ZEND_OP2_TYPE(opline) == IS_TMP_VAR &&
 			ZEND_OP2(opline).var == var) {
 
 			update_op2_const(op_array, opline, val TSRMLS_CC);
-			/* TMP_VAR my be used only once */
+			/* TMP_VAR may be used only once */
+			val = NULL;
 			break;
 		}
 		opline++;
 	}
+	if (val) {
+		zval_dtor(val);
+	}
 }
 
 #include "Optimizer/nop_removal.c"

run-tests.php

@@ -1356,6 +1356,7 @@ function run_test($php, $file, $env)
 			} else {
 				show_result('SKIP', $tested, $tested_file, "reason: CGI not available");
 
+				junit_init_suite(junit_get_suitename_for($shortname));
 				junit_mark_test_as('SKIP', $shortname, $tested, 0, 'CGI not available');
 				return 'SKIPPED';
 			}