From 385748547c59e6ad85a89788e279d94a0046c139 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Sun, 5 Jul 2026 00:35:54 +0200 Subject: [PATCH] sapi/phpdbg: remove dead str_type assignments before goto The switch in phpdbg_print_breakpoints() assigned str_type per case and jumped to a shared label that immediately recomputed the same value from brake->type, making the pre-goto assignments dead. Set str_type directly per case instead and drop the goto. --- sapi/phpdbg/phpdbg_bp.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index f4e4ef81af2f..1233f0430121 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -1500,33 +1500,24 @@ PHPDBG_API void phpdbg_print_breakpoints(zend_ulong type) /* {{{ */ switch (brake->type) { case PHPDBG_BREAK_METHOD_OPLINE: str_type = "method"; - goto print_opline; + break; case PHPDBG_BREAK_FUNCTION_OPLINE: str_type = "function"; - goto print_opline; + break; case PHPDBG_BREAK_FILE_OPLINE: - str_type = "method"; - - print_opline: { - if (brake->type == PHPDBG_BREAK_METHOD_OPLINE) { - str_type = "method"; - } else if (brake->type == PHPDBG_BREAK_FUNCTION_OPLINE) { - str_type = "function"; - } else if (brake->type == PHPDBG_BREAK_FILE_OPLINE) { - str_type = "file"; - } - - phpdbg_writeln("#%d\t\t#"ZEND_ULONG_FMT"\t\t(%s breakpoint)%s", - brake->id, brake->opline, str_type, - ((phpdbg_breakbase_t *) brake)->disabled ? " [disabled]" : ""); - } break; + str_type = "file"; + break; default: phpdbg_writeln("#%d\t\t#"ZEND_ULONG_FMT"%s", brake->id, brake->opline, ((phpdbg_breakbase_t *) brake)->disabled ? " [disabled]" : ""); - break; + continue; } + + phpdbg_writeln("#%d\t\t#"ZEND_ULONG_FMT"\t\t(%s breakpoint)%s", + brake->id, brake->opline, str_type, + ((phpdbg_breakbase_t *) brake)->disabled ? " [disabled]" : ""); } ZEND_HASH_FOREACH_END(); } break;