this is patch I comitted yesterday (but failed to send email) which removes
forgotten sanity check from original fix. The check tries to catch cases where
we do merge definitions and declarations to see if resolution merging logic is
live.  It is.

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

Index: lto.c
--- lto.c       (revision 257412)
+++ lto.c       (working copy)
@@ -839,7 +839,6 @@ register_resolution (struct lto_file_dec
       = 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

Reply via email to