aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2015-01-21 19:19:25 +0100
committerJan Hubicka <hubicka@gcc.gnu.org>2015-01-21 18:19:25 +0000
commit173148bb1200269fb5d9c0aab13ca9c34fbc8d36 (patch)
treea3e5fd1072829092a58fd46c965239291d0aca59
parent2f3c4b6968e969001578fddc4fac848b8726dde3 (diff)
downloadgcc-173148bb1200269fb5d9c0aab13ca9c34fbc8d36.zip
gcc-173148bb1200269fb5d9c0aab13ca9c34fbc8d36.tar.gz
gcc-173148bb1200269fb5d9c0aab13ca9c34fbc8d36.tar.bz2
ipa-utils.c (ipa_merge_profiles): Avoid ICE on mismatch in indirect edges.
* ipa-utils.c (ipa_merge_profiles): Avoid ICE on mismatch in indirect edges. From-SVN: r219962
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/ipa-utils.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1c0a45e..4f3cc89 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-21 Jan Hubicka <hubicka@ucw.cz>
+
+ * ipa-utils.c (ipa_merge_profiles): Avoid ICE on mismatch in indirect
+ edges.
+
2015-01-21 Bernd Edlinger <bernd.edlinger@hotmail.de>
* gimplify.c (gimplify_function_tree): Check the no_sanitize_thread
diff --git a/gcc/ipa-utils.c b/gcc/ipa-utils.c
index 7612548..a8bb42d 100644
--- a/gcc/ipa-utils.c
+++ b/gcc/ipa-utils.c
@@ -634,7 +634,7 @@ ipa_merge_profiles (struct cgraph_node *dst,
speculations when merging. */
gcc_unreachable ();
}
- else if (e2->speculative)
+ else if (e2 && e2->speculative)
{
cgraph_edge *direct, *indirect;
ipa_ref *ref;