aboutsummaryrefslogtreecommitdiff
path: root/gcc/multiple_target.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-03-14 14:05:34 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2019-03-14 14:05:34 +0100
commit27814aed3462d6bdce3c653e5e66d5e58cf4a5e7 (patch)
tree04ae155d33fa76c4c587c95722b0d0581de16022 /gcc/multiple_target.c
parent87654f1813a0f582645f72d87f7fb8c78b92ee6a (diff)
downloadgcc-27814aed3462d6bdce3c653e5e66d5e58cf4a5e7.zip
gcc-27814aed3462d6bdce3c653e5e66d5e58cf4a5e7.tar.gz
gcc-27814aed3462d6bdce3c653e5e66d5e58cf4a5e7.tar.bz2
re PR ipa/89684 (ICE in gsi_for_stmt, at gimple-iterator.c:613)
PR ipa/89684 * multiple_target.c (create_dispatcher_calls): Change references_to_redirect from vector of ipa_ref * to vector of ipa_ref. In the node->iterate_referring loop, push *ref rather than ref, call ref->remove_reference () and always pass 0 to iterate_referring. * gcc.target/i386/pr89684.c: New test. From-SVN: r269681
Diffstat (limited to 'gcc/multiple_target.c')
-rw-r--r--gcc/multiple_target.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/gcc/multiple_target.c b/gcc/multiple_target.c
index 6126f42..fd983cc 100644
--- a/gcc/multiple_target.c
+++ b/gcc/multiple_target.c
@@ -103,10 +103,16 @@ create_dispatcher_calls (struct cgraph_node *node)
inode->resolve_alias (cgraph_node::get (resolver_decl));
auto_vec<cgraph_edge *> edges_to_redirect;
- auto_vec<ipa_ref *> references_to_redirect;
+ /* We need to capture the references by value rather than just pointers to them
+ and remove them right away, as removing them later would invalidate what
+ some other reference pointers point to. */
+ auto_vec<ipa_ref> references_to_redirect;
- for (unsigned i = 0; node->iterate_referring (i, ref); i++)
- references_to_redirect.safe_push (ref);
+ while (node->iterate_referring (0, ref))
+ {
+ references_to_redirect.safe_push (*ref);
+ ref->remove_reference ();
+ }
/* We need to remember NEXT_CALLER as it could be modified in the loop. */
for (cgraph_edge *e = node->callers; e ; e = e->next_caller)
@@ -146,13 +152,11 @@ create_dispatcher_calls (struct cgraph_node *node)
}
symtab_node *source = ref->referring;
- ref->remove_reference ();
source->create_reference (inode, IPA_REF_ADDR);
}
else if (ref->use == IPA_REF_ALIAS)
{
symtab_node *source = ref->referring;
- ref->remove_reference ();
source->create_reference (inode, IPA_REF_ALIAS);
source->add_to_same_comdat_group (inode);
}