com php-src: Simplify bf/bt computation in pi placement: ext/opcache/Optimizer/zend_ssa.c
| From: | Nikita Popov | Date: | Sat, 19 Dec 2015 23:03:52 +0000 |
| Subject: | com php-src: Simplify bf/bt computation in pi placement: ext/opcache/Optimizer/zend_ssa.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90355@lists.php.net to get a copy of this message | ||
Commit: fc68094497fc78ca401856c931b0603c7b9407f8
Author: Nikita Popov <nikic@php.net> Sat, 19 Dec 2015 21:00:38 +0100
Parents: d7424a5b04110d7ca6a787cb53876c9778a26362
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fc68094497fc78ca401856c931b0603c7b9407f8
Log:
Simplify bf/bt computation in pi placement
The meaning of the successors is well-defined, no need to check it.
Changed paths:
M ext/opcache/Optimizer/zend_ssa.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_ssa.c b/ext/opcache/Optimizer/zend_ssa.c
index 3677b4b..f1ca394 100644
--- a/ext/opcache/Optimizer/zend_ssa.c
+++ b/ext/opcache/Optimizer/zend_ssa.c
@@ -516,31 +516,13 @@ int zend_build_ssa(zend_arena **arena, const zend_op_array *op_array, uint32_t
b
*/
switch (opline->opcode) {
case ZEND_JMPZ:
- if (ssa->cfg.blocks[ssa->cfg.blocks[j].successors[0]].start == OP_JMP_ADDR(opline,
opline->op2) - op_array->opcodes) {
- bf = ssa->cfg.blocks[j].successors[0];
- bt = ssa->cfg.blocks[j].successors[1];
- } else {
- bt = ssa->cfg.blocks[j].successors[0];
- bf = ssa->cfg.blocks[j].successors[1];
- }
+ case ZEND_JMPZNZ:
+ bf = ssa->cfg.blocks[j].successors[0];
+ bt = ssa->cfg.blocks[j].successors[1];
break;
case ZEND_JMPNZ:
- if (ssa->cfg.blocks[ssa->cfg.blocks[j].successors[0]].start == OP_JMP_ADDR(opline,
opline->op2) - op_array->opcodes) {
- bt = ssa->cfg.blocks[j].successors[0];
- bf = ssa->cfg.blocks[j].successors[1];
- } else {
- bf = ssa->cfg.blocks[j].successors[0];
- bt = ssa->cfg.blocks[j].successors[1];
- }
- break;
- case ZEND_JMPZNZ:
- if (ssa->cfg.blocks[ssa->cfg.blocks[j].successors[0]].start == OP_JMP_ADDR(opline,
opline->op2) - op_array->opcodes) {
- bf = ssa->cfg.blocks[j].successors[0];
- bt = ssa->cfg.blocks[j].successors[1];
- } else {
- bt = ssa->cfg.blocks[j].successors[0];
- bf = ssa->cfg.blocks[j].successors[1];
- }
+ bt = ssa->cfg.blocks[j].successors[0];
+ bf = ssa->cfg.blocks[j].successors[1];
break;
default:
continue;