From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id CC946385802F; Tue, 24 Jan 2023 14:27:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CC946385802F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674570448; bh=LYUKLBRPBB/4YRrtXZNXnm7P2hvIu2AOUSJaWYom6mw=; h=From:To:Subject:Date:From; b=u9KUE+58DYQU9k2MIqgkX1ywlVFM+OUNoXsZiyinNuIS52T48QF7+GwIbdzFZAFwE Qg3N8k0WLaLdLDfejAwkfk2HZ4OH96KNwX1xIRLSGPEETfjrMMB9XPd2TRRcfgXsNi zW9jSd23LQH1iAmlwmtunGJPaXWY7/J9KLhifCbU= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9064] tree-optimization/108076 - if-conversion and forced labels X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 45cff68d063b689bd6a9f30827b1fdd3f5ea2cb4 X-Git-Newrev: a3dfcaac560f5589028fdd967bfaa60d84c265ac Message-Id: <20230124142728.CC946385802F@sourceware.org> Date: Tue, 24 Jan 2023 14:27:28 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a3dfcaac560f5589028fdd967bfaa60d84c265ac commit r12-9064-ga3dfcaac560f5589028fdd967bfaa60d84c265ac Author: Richard Biener Date: Mon Dec 12 17:52:46 2022 +0100 tree-optimization/108076 - if-conversion and forced labels When doing if-conversion we simply throw away labels without checking whether they are possibly targets of non-local gotos or have their address taken. The following rectifies this and refuses to if-convert such loops. PR tree-optimization/108076 * tree-if-conv.cc (if_convertible_loop_p_1): Reject blocks with non-local or forced labels that we later remove labels from. * gcc.dg/torture/pr108076.c: New testcase. (cherry picked from commit b4fddbe9592e9feb37ce567d90af822b75995531) Diff: --- gcc/testsuite/gcc.dg/torture/pr108076.c | 17 +++++++++++++++++ gcc/tree-if-conv.cc | 14 ++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/gcc.dg/torture/pr108076.c b/gcc/testsuite/gcc.dg/torture/pr108076.c new file mode 100644 index 00000000000..ebe2e51bee0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr108076.c @@ -0,0 +1,17 @@ +/* { dg-do link } */ + +static void *j; +int v, g; +__attribute__((__leaf__)) int atoi (const char *); + +int +main () +{ + j = &&lab1; + &&lab2; + atoi ("42"); +lab1: +lab2: + if (v) + goto *j; +} diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc index 7495ed653c0..3574c673ed8 100644 --- a/gcc/tree-if-conv.cc +++ b/gcc/tree-if-conv.cc @@ -1431,10 +1431,20 @@ if_convertible_loop_p_1 (class loop *loop, vec *refs) basic_block bb = ifc_bbs[i]; gimple_stmt_iterator gsi; + bool may_have_nonlocal_labels + = bb_with_exit_edge_p (loop, bb) || bb == loop->latch; for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi)) switch (gimple_code (gsi_stmt (gsi))) { case GIMPLE_LABEL: + if (!may_have_nonlocal_labels) + { + tree label + = gimple_label_label (as_a (gsi_stmt (gsi))); + if (DECL_NONLOCAL (label) || FORCED_LABEL (label)) + return false; + } + /* Fallthru. */ case GIMPLE_ASSIGN: case GIMPLE_CALL: case GIMPLE_DEBUG: @@ -2646,8 +2656,8 @@ remove_conditions_and_labels (loop_p loop) basic_block bb = ifc_bbs[i]; if (bb_with_exit_edge_p (loop, bb) - || bb == loop->latch) - continue; + || bb == loop->latch) + continue; for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); ) switch (gimple_code (gsi_stmt (gsi)))