Optimizer: Optimize T = BOOL(X) + TYPE_CHECK(T, true) to just BOOL

Resolves php#18411

Author: TimWolla

Zend/Optimizer/block_pass.c

@@ -482,12 +482,42 @@ static void zend_optimize_block(zend_basic_block *block, zend_op_array *op_array
 					opline->extended_value = (1 << Z_TYPE(ZEND_OP1_LITERAL(opline)));
 					COPY_NODE(opline->op1, opline->op2);
 					SET_UNUSED(opline->op2);
+					goto optimize_type_check;
 				}
 				if (opline->op2_type == IS_CONST &&
 					(Z_TYPE(ZEND_OP2_LITERAL(opline)) <= IS_TRUE && Z_TYPE(ZEND_OP2_LITERAL(opline)) >= IS_NULL)) {
 					opline->opcode = ZEND_TYPE_CHECK;
 					opline->extended_value = (1 << Z_TYPE(ZEND_OP2_LITERAL(opline)));
 					SET_UNUSED(opline->op2);
+					goto optimize_type_check;
+				}
+				break;
+			case ZEND_TYPE_CHECK:
+				optimize_type_check:
+				if (opline->extended_value == (1 << IS_TRUE) || opline->extended_value == (1 << IS_FALSE)) {
+					if (opline->op1_type == IS_TMP_VAR &&
+						!zend_bitset_in(used_ext, VAR_NUM(opline->op1.var))) {
+						src = VAR_SOURCE(opline->op1);
+
+						if (src) {
+							switch (src->opcode) {
+								case ZEND_BOOL:
+								case ZEND_BOOL_NOT:
+									/* T = BOOL(X) + TYPE_CHECK(T, true) -> BOOL(X), NOP */
+									/* T = BOOL(X) + TYPE_CHECK(T, false) -> BOOL_NOT(X), NOP */
+									/* T = BOOL_NOT(X) + IS_IDENTICAL(T, true) -> BOOL_NOT(X), NOP */
+									/* T = BOOL_NOT(X) + IS_IDENTICAL(T, false) -> BOOL(X), NOP */
+									src->opcode =
+										((src->opcode == ZEND_BOOL) == (opline->extended_value == (1 << IS_TRUE))) ?
+										ZEND_BOOL : ZEND_BOOL_NOT;
+									COPY_NODE(src->result, opline->result);
+									SET_VAR_SOURCE(src);
+									MAKE_NOP(opline);
+									++(*opt_count);
+									break;
+							}
+						}
+					}
 				}
 				break;
 

ext/opcache/tests/match/005.phpt

@@ -23,35 +23,27 @@ var_dump($result);
 ?>
 --EXPECTF--
 $_main:
-     ; (lines=28, args=0, vars=2, tmps=3)
+     ; (lines=20, args=0, vars=2, tmps=1)
      ; (after optimizer)
      ; %s
 0000 ASSIGN CV0($text) string("Bienvenue chez nous")
 0001 T2 = FRAMELESS_ICALL_2(preg_match) string("/Welcome/") CV0($text)
-0002 T3 = BOOL T2
-0003 T2 = TYPE_CHECK (true) T3
-0004 JMPNZ T2 0018
-0005 T4 = FRAMELESS_ICALL_2(preg_match) string("/Hello/") CV0($text)
-0006 T3 = BOOL T4
-0007 T2 = TYPE_CHECK (true) T3
-0008 JMPNZ T2 0018
-0009 T4 = FRAMELESS_ICALL_2(preg_match) string("/Bienvenue/") CV0($text)
-0010 T3 = BOOL T4
-0011 T2 = TYPE_CHECK (true) T3
-0012 JMPNZ T2 0020
-0013 T4 = FRAMELESS_ICALL_2(preg_match) string("/Bonjour/") CV0($text)
-0014 T3 = BOOL T4
-0015 T2 = TYPE_CHECK (true) T3
-0016 JMPNZ T2 0020
-0017 JMP 0022
-0018 T2 = QM_ASSIGN string("en")
-0019 JMP 0023
-0020 T2 = QM_ASSIGN string("fr")
-0021 JMP 0023
-0022 T2 = QM_ASSIGN string("other")
-0023 ASSIGN CV1($result) T2
-0024 INIT_FCALL 1 %d string("var_dump")
-0025 SEND_VAR CV1($result) 1
-0026 DO_ICALL
-0027 RETURN int(1)
+0002 JMPNZ T2 0010
+0003 T2 = FRAMELESS_ICALL_2(preg_match) string("/Hello/") CV0($text)
+0004 JMPNZ T2 0010
+0005 T2 = FRAMELESS_ICALL_2(preg_match) string("/Bienvenue/") CV0($text)
+0006 JMPNZ T2 0012
+0007 T2 = FRAMELESS_ICALL_2(preg_match) string("/Bonjour/") CV0($text)
+0008 JMPNZ T2 0012
+0009 JMP 0014
+0010 T2 = QM_ASSIGN string("en")
+0011 JMP 0015
+0012 T2 = QM_ASSIGN string("fr")
+0013 JMP 0015
+0014 T2 = QM_ASSIGN string("other")
+0015 ASSIGN CV1($result) T2
+0016 INIT_FCALL 1 %d string("var_dump")
+0017 SEND_VAR CV1($result) 1
+0018 DO_ICALL
+0019 RETURN int(1)
 string(2) "fr"

ext/opcache/tests/opt/block_pass_007.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Block Pass 007: BOOL + TYPE_CHECK
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.opt_debug_level=0x20000
+--EXTENSIONS--
+opcache
+--FILE--
+<?php
+$f = random_int(1, 2);
+
+var_dump(!$f === true);
+var_dump(!$f === false);
+var_dump(!!$f === true);
+var_dump(!!$f === false);
+?>
+--EXPECTF--
+$_main:
+     ; (lines=22, args=0, vars=1, tmps=1)
+     ; (after optimizer)
+     ; %s
+0000 INIT_FCALL 2 %d string("random_int")
+0001 SEND_VAL int(1) 1
+0002 SEND_VAL int(2) 2
+0003 V1 = DO_ICALL
+0004 ASSIGN CV0($f) V1
+0005 INIT_FCALL 1 %d string("var_dump")
+0006 T1 = BOOL_NOT CV0($f)
+0007 SEND_VAL T1 1
+0008 DO_ICALL
+0009 INIT_FCALL 1 %d string("var_dump")
+0010 T1 = BOOL CV0($f)
+0011 SEND_VAL T1 1
+0012 DO_ICALL
+0013 INIT_FCALL 1 %d string("var_dump")
+0014 T1 = BOOL CV0($f)
+0015 SEND_VAL T1 1
+0016 DO_ICALL
+0017 INIT_FCALL 1 %d string("var_dump")
+0018 T1 = BOOL_NOT CV0($f)
+0019 SEND_VAL T1 1
+0020 DO_ICALL
+0021 RETURN int(1)
+bool(false)
+bool(true)
+bool(true)
+bool(false)