From 0beccc51f1bf44fb3efeb1131f8c86eb7dc5014f Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 15 Apr 2017 12:35:09 +0200 Subject: [PATCH] Fix compact_literals of INIT_METHOD_CALL with CONST op1 --- ext/opcache/Optimizer/compact_literals.c | 3 +++ ext/opcache/tests/method_call_on_literal.phpt | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 ext/opcache/tests/method_call_on_literal.phpt diff --git a/ext/opcache/Optimizer/compact_literals.c b/ext/opcache/Optimizer/compact_literals.c index 0637d77f218..f417bef5fb3 100644 --- a/ext/opcache/Optimizer/compact_literals.c +++ b/ext/opcache/Optimizer/compact_literals.c @@ -146,6 +146,9 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx LITERAL_INFO(opline->op2.constant, LITERAL_FUNC, 1, 1, 3); break; case ZEND_INIT_METHOD_CALL: + if (ZEND_OP1_TYPE(opline) == IS_CONST) { + LITERAL_INFO(opline->op1.constant, LITERAL_VALUE, 1, 0, 1); + } if (ZEND_OP2_TYPE(opline) == IS_CONST) { optimizer_literal_obj_info( info, diff --git a/ext/opcache/tests/method_call_on_literal.phpt b/ext/opcache/tests/method_call_on_literal.phpt new file mode 100644 index 00000000000..bf89caa4184 --- /dev/null +++ b/ext/opcache/tests/method_call_on_literal.phpt @@ -0,0 +1,14 @@ +--TEST-- +Literal compaction should take method calls on literals into account +--FILE-- +foo(); +} catch (Error $e) { + echo $e->getMessage(), "\n"; +} + +?> +--EXPECT-- +Call to a member function foo() on integer