summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/ipa-icf.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0d4e6f2decf..62a4d3c5747 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-05 Jan Hubicka <hubicka@ucw.cz>
+
+ * ipa-icf.c (sem_function::merge): Check that local_original exists.
+
2015-12-05 David Edelsohn <dje.gcc@gmail.com>
PR target/68609
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 18039ef7afd..0029a48a61b 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -1359,7 +1359,9 @@ sem_function::merge (sem_item *alias_item)
{
if (dump_file)
fprintf (dump_file, "Dropping merged_comdat flag.\n\n");
- local_original->merged_comdat = original->merged_comdat = false;
+ if (local_original)
+ local_original->merged_comdat = false;
+ original->merged_comdat = false;
}
if (remove)