Backport r257442

2018-03-07  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2018-01-30  Jan Hubicka  <hubicka@ucw.cz>

	* lto.c (register_resolution): Remove forgotten sanity check.

From-SVN: r258322

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index a2be1c32fcce8324121bd9d5af5a8acf5e86d3c6..d034997c3d34cd5449ce7c67cbd5391568228ba2 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-07  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2018-01-30  Jan Hubicka  <hubicka@ucw.cz>
+
+       * lto.c (register_resolution): Remove forgotten sanity check.
+
 2018-03-07  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c
index d218b4c55f169627dda09f1ee5ff7fce28ee29ef..2809917cd61f1400ad08f18d99f8ae2eacd42cf7 100644 (file)
--- a/gcc/lto/lto.c
+++ b/gcc/lto/lto.c
@@ -837,7 +837,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