From 4fb75a7a671ac10132e413ad766b1ce5921ffd15 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Wed, 7 Mar 2018 10:44:36 +0100 Subject: [PATCH] Backport r257442 2018-03-07 Martin Liska Backport from mainline 2018-01-30 Jan Hubicka * lto.c (register_resolution): Remove forgotten sanity check. From-SVN: r258322 --- gcc/lto/ChangeLog | 7 +++++++ gcc/lto/lto.c | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index a2be1c32fcce..d034997c3d34 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,10 @@ +2018-03-07 Martin Liska + + Backport from mainline + 2018-01-30 Jan Hubicka + + * lto.c (register_resolution): Remove forgotten sanity check. + 2018-03-07 Martin Liska Backport from mainline diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index d218b4c55f16..2809917cd61f 100644 --- 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; 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 -- 2.47.2