From 36dafade51080d4b42a01eda430e511797d472fd Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 25 Dec 2021 12:39:52 +0100 Subject: [PATCH] Remove unnecessary try_replace_op1() special cases update_op1_const() can handle these nowadays. --- Zend/Optimizer/sccp.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/Zend/Optimizer/sccp.c b/Zend/Optimizer/sccp.c index 4876a198cb3..582b6487939 100644 --- a/Zend/Optimizer/sccp.c +++ b/Zend/Optimizer/sccp.c @@ -297,23 +297,6 @@ static bool try_replace_op1( } else { // TODO: check the following special cases ??? switch (opline->opcode) { - case ZEND_CASE: - opline->opcode = ZEND_IS_EQUAL; - goto replace_op1_simple; - case ZEND_CASE_STRICT: - opline->opcode = ZEND_IS_IDENTICAL; - goto replace_op1_simple; - case ZEND_FETCH_LIST_R: - case ZEND_SWITCH_STRING: - case ZEND_SWITCH_LONG: - case ZEND_MATCH: -replace_op1_simple: - if (Z_TYPE(zv) == IS_STRING) { - zend_string_hash_val(Z_STR(zv)); - } - opline->op1.constant = zend_optimizer_add_literal(ctx->scdf.op_array, &zv); - opline->op1_type = IS_CONST; - return 1; case ZEND_INSTANCEOF: zval_ptr_dtor_nogc(&zv); ZVAL_FALSE(&zv);