Merge branch 'PHP-7.0' into PHP-7.1

ext/opcache/Optimizer/optimize_func_calls.c

@@ -222,6 +222,14 @@ void zend_optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
 							opline->opcode = ZEND_FETCH_STATIC_PROP_W;
 						}
 					} else {
+						if (opline->opcode == ZEND_FETCH_DIM_FUNC_ARG
+								&& opline->op2_type == IS_UNUSED) {
+							/* FETCH_DIM_FUNC_ARG supports UNUSED op2, while FETCH_DIM_R does not.
+							 * Performing the replacement would create an invalid opcode. */
+							call_stack[call - 1].try_inline = 0;
+							break;
+						}
+
 						opline->extended_value &= ZEND_FETCH_TYPE_MASK;
 						if (opline->opcode != ZEND_FETCH_STATIC_PROP_FUNC_ARG) {
 							opline->opcode -= 12;

ext/opcache/tests/optimize_func_calls_001.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Don't create FETCH_DIM_R with UNUSED op2
+--FILE--
+<?php
+
+// Order matters
+test($arr[]);
+function test($arg) {}
+
+?>
+--EXPECTF--
+Fatal error: Uncaught Error: Cannot use [] for reading in %s:%d
+Stack trace:
+#0 {main}
+  thrown in %s on line %d