diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2015-12-06 06:45:16 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2015-12-06 05:45:16 +0000 |
| commit | e9e707983b9b64f5344e1892e4a065cd31dd959d (patch) | |
| tree | 2b0f3677ea4e1f63af2a25115ee388d27ab75eee | |
| parent | c7eea75bf8b0c0dbe73c6d977972d63988392519 (diff) | |
| download | gcc-e9e707983b9b64f5344e1892e4a065cd31dd959d.zip gcc-e9e707983b9b64f5344e1892e4a065cd31dd959d.tar.gz gcc-e9e707983b9b64f5344e1892e4a065cd31dd959d.tar.bz2 | |
* ipa-icf.c (sem_function::merge): Check that local_original exists.
From-SVN: r231328
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ipa-icf.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0d4e6f2..62a4d3c 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 18039ef..0029a48 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) |