diff options
| author | Richard Biener <rguenther@suse.de> | 2022-12-12 17:52:46 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2022-12-13 11:39:59 +0100 |
| commit | b4fddbe9592e9feb37ce567d90af822b75995531 (patch) | |
| tree | 5cbc84750383eabbde9eb34c8255518c28ff865f | |
| parent | 0a43f7b1a73c8e3b9cefffe430274d0a3d6d3291 (diff) | |
| download | gcc-b4fddbe9592e9feb37ce567d90af822b75995531.zip gcc-b4fddbe9592e9feb37ce567d90af822b75995531.tar.gz gcc-b4fddbe9592e9feb37ce567d90af822b75995531.tar.bz2 | |
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.
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr108076.c | 17 | ||||
| -rw-r--r-- | 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 0000000..ebe2e51 --- /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 64b20b4..0807201 100644 --- a/gcc/tree-if-conv.cc +++ b/gcc/tree-if-conv.cc @@ -1433,10 +1433,20 @@ if_convertible_loop_p_1 (class loop *loop, vec<data_reference_p> *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 <glabel *> (gsi_stmt (gsi))); + if (DECL_NONLOCAL (label) || FORCED_LABEL (label)) + return false; + } + /* Fallthru. */ case GIMPLE_ASSIGN: case GIMPLE_CALL: case GIMPLE_DEBUG: @@ -2627,8 +2637,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))) |