com php-src: Fix VERIFY_RETURN_TYPE elision: ext/opca che/Optimizer/dfa_pass.c ext/opcache/tests/ssa_bug_ 003.phpt

From: Date: Sun, 05 Jun 2016 21:44:08 +0000
Subject: com php-src: Fix VERIFY_RETURN_TYPE elision: ext/opca che/Optimizer/dfa_pass.c ext/opcache/tests/ssa_bug_ 003.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92317@lists.php.net to get a copy of this message
Commit: e6296f0dcc68adc9c6d6c8efc47b578a30c582ed Author: Nikita Popov <nikic@php.net> Sun, 5 Jun 2016 23:43:20 +0200 Parents: c5348850dfea8bc540e9553c9197f6089719b0e2 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6296f0dcc68adc9c6d6c8efc47b578a30c582ed Log: Fix VERIFY_RETURN_TYPE elision This both fixes incorrect elision and allows elision for cases where we only have a subset (e.g. true of bool). Changed paths: M ext/opcache/Optimizer/dfa_pass.c A ext/opcache/tests/ssa_bug_003.phpt Diff: diff --git a/ext/opcache/Optimizer/dfa_pass.c b/ext/opcache/Optimizer/dfa_pass.c index 2ebbfbd..1b3de7e 100644 --- a/ext/opcache/Optimizer/dfa_pass.c +++ b/ext/opcache/Optimizer/dfa_pass.c @@ -319,6 +319,30 @@ static void zend_ssa_remove_nops(zend_op_array *op_array, zend_ssa *ssa) free_alloca(shiftlist, use_heap); } +static inline zend_bool can_elide_return_type_check( + zend_op_array *op_array, zend_ssa *ssa, zend_ssa_op *ssa_op) { + zend_arg_info *info = &op_array->arg_info[-1]; + zend_ssa_var_info *use_info = &ssa->var_info[ssa_op->op1_use]; + zend_ssa_var_info *def_info = &ssa->var_info[ssa_op->op1_def]; + + /* A type is possible that is not in the allowed types */ + if ((use_info->type & (MAY_BE_ANY|MAY_BE_UNDEF)) & ~(def_info->type & MAY_BE_ANY)) { + return 0; + } + + if (info->type_hint == IS_CALLABLE) { + return 0; + } + + if (info->class_name) { + if (!use_info->ce || !def_info->ce || !instanceof_function(use_info->ce, def_info->ce)) { + return 0; + } + } + + return 1; +} + void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx, zend_ssa *ssa) { if (ctx->debug_level & ZEND_DUMP_BEFORE_DFA_PASS) { @@ -523,7 +547,7 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx && ssa->ops[op_1].op1_use >= 0 && ssa->ops[op_1].op1_use_chain == -1 && ssa->vars[v].use_chain >= 0 - && (ssa->var_info[ssa->ops[op_1].op1_use].type & (MAY_BE_ANY|MAY_BE_UNDEF)) == (ssa->var_info[ssa->ops[op_1].op1_def].type & MAY_BE_ANY)) { + && can_elide_return_type_check(op_array, ssa, &ssa->ops[op_1])) { // op_1: VERIFY_RETURN_TYPE #orig_var.CV [T] -> #v.CV [T] => NOP diff --git a/ext/opcache/tests/ssa_bug_003.phpt b/ext/opcache/tests/ssa_bug_003.phpt new file mode 100644 index 0000000..2895551 --- /dev/null +++ b/ext/opcache/tests/ssa_bug_003.phpt @@ -0,0 +1,38 @@ +--TEST-- +Incorrect elision of return type checks +--FILE-- +<?php + +function test1($x) : callable { + if ($x == 1) { + $c = 'foo'; + } elseif ($x == 2) { + $c = new stdClass; + } else { + $c = [$x => &$x]; + } + return $c; +} + +try { + test1(1); +} catch (Error $e) { + echo "Error: {$e->getMessage()}\n"; +} + +class Foo {} +function test2() : Foo { + $obj = new stdClass; + return $obj; +} + +try { + test2(); +} catch (Error $e) { + echo "Error: {$e->getMessage()}\n"; +} + +?> +--EXPECT-- +Error: Return value of test1() must be callable, string returned +Error: Return value of test2() must be an instance of Foo, instance of stdClass returned

« previous php.cvs (#92317) next »