aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2018-02-07 11:20:03 +0100
committerJan Hubicka <hubicka@gcc.gnu.org>2018-02-07 10:20:03 +0000
commit26a823f03b214ce8412c4a255e483cc81c315bb4 (patch)
tree65bf60e031a8fc0bc51071ab1e5227394547d308
parente4c7306692dbcbbbe1d7c82eac8f6a44a4c909f9 (diff)
downloadgcc-26a823f03b214ce8412c4a255e483cc81c315bb4.zip
gcc-26a823f03b214ce8412c4a255e483cc81c315bb4.tar.gz
gcc-26a823f03b214ce8412c4a255e483cc81c315bb4.tar.bz2
* lto.c (register_resolution): Remove forgotten sanity check.
From-SVN: r257442
-rw-r--r--gcc/lto/ChangeLog4
-rw-r--r--gcc/lto/lto.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 4862ea9..bed71f3 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,5 +1,9 @@
2018-01-30 Jan Hubicka <hubicka@ucw.cz>
+ * lto.c (register_resolution): Remove forgotten sanity check.
+
+2018-01-30 Jan Hubicka <hubicka@ucw.cz>
+
PR lto/81004
* lto.c: Include builtins.h
(register_resolution): Merge resolutions in case trees was
diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index 0ac8b1e..8c557d3 100644
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -839,7 +839,6 @@ register_resolution (struct lto_file_decl_data *file_data, tree decl,
= new hash_map<tree, ld_plugin_symbol_resolution>;
ld_plugin_symbol_resolution_t &res
= file_data->resolution_map->get_or_insert (decl, &existed);
- gcc_assert (!existed || res == resolution);
if (!existed
|| resolution == LDPR_PREVAILING_DEF_IRONLY
|| resolution == LDPR_PREVAILING_DEF