Disable inlining for $this->foo(), because $this may be not in object context

dstogov · dstogov · commit 3a452426693a · 2016-06-30T21:05:48.000+03:00
diff --git a/ext/opcache/Optimizer/optimize_func_calls.c b/ext/opcache/Optimizer/optimize_func_calls.c
@@ -100,7 +100,7 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o
 
 			if (fcall->opcode == ZEND_INIT_METHOD_CALL && fcall->op1_type == IS_UNUSED) {
 				/* TODO: we can't inlne methods, because $this may be used
-				 *       not in class context ???
+				 *       not in object context ???
 				 */
 				return;
 			}
diff --git a/ext/opcache/tests/wrong_inlining_002.phpt b/ext/opcache/tests/wrong_inlining_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Pass result of inlined function by reference
+$this not in object context
 --INI--
 opcache.enable=1
 opcache.enable_cli=1

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static void zend_try_inline_call(zend_op_array op_array, zend_op fcall, zend_o`
`100`	`100`
`101`	`101`	`if (fcall->opcode == ZEND_INIT_METHOD_CALL && fcall->op1_type == IS_UNUSED) {`
`102`	`102`	`/* TODO: we can't inlne methods, because $this may be used`
`103`		`- * not in class context ???`
	`103`	`+ * not in object context ???`
`104`	`104`	`*/`
`105`	`105`	`return;`
`106`	`106`	`}`