mirror of
https://github.com/php/php-src.git
synced 2024-09-29 05:46:06 +00:00
Disable inlining for $this->foo(), because $this may be used not in object context
This commit is contained in:
parent
5ae07dc34a
commit
c3667a5eed
@ -98,6 +98,12 @@ static void zend_try_inline_call(zend_op_array *op_array, zend_op *fcall, zend_o
|
||||
|
||||
if (ret_opline->op1_type == IS_CONST) {
|
||||
|
||||
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 ???
|
||||
*/
|
||||
return;
|
||||
}
|
||||
if (fcall->extended_value < func->op_array.num_args) {
|
||||
/* don't inline funcions with named constants in default arguments */
|
||||
uint32_t n = fcall->extended_value;
|
||||
|
29
ext/opcache/tests/wrong_inlining_002.phpt
Normal file
29
ext/opcache/tests/wrong_inlining_002.phpt
Normal file
@ -0,0 +1,29 @@
|
||||
--TEST--
|
||||
Pass result of inlined function by reference
|
||||
--INI--
|
||||
opcache.enable=1
|
||||
opcache.enable_cli=1
|
||||
opcache.optimization_level=-1
|
||||
--SKIPIF--
|
||||
<?php require_once('skipif.inc'); ?>
|
||||
--FILE--
|
||||
<?php
|
||||
class Foo {
|
||||
private function getConst() {
|
||||
return 42;
|
||||
}
|
||||
public function test() {
|
||||
var_dump($this->getConst());
|
||||
}
|
||||
}
|
||||
|
||||
Foo::test();
|
||||
?>
|
||||
--EXPECTF--
|
||||
Deprecated: Non-static method Foo::test() should not be called statically in %swrong_inlining_002.php on line 11
|
||||
|
||||
Fatal error: Uncaught Error: Using $this when not in object context in %swrong_inlining_002.php:7
|
||||
Stack trace:
|
||||
#0 %swrong_inlining_002.php(11): Foo::test()
|
||||
#1 {main}
|
||||
thrown in %swrong_inlining_002.php on line 7
|
Loading…
Reference in New Issue
Block a user