diff options
| author | Jan Hubicka <jh@suse.cz> | 2018-10-26 11:32:47 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2018-10-26 09:32:47 +0000 |
| commit | abb967da1c0d6deb98de488213aaaa06a785adc5 (patch) | |
| tree | 0364fb377420f21af8a467863bd493d85edea497 /gcc/lto | |
| parent | a1f072e2441c58f6a486f90bb9a32bd5f6c51cb4 (diff) | |
| download | gcc-abb967da1c0d6deb98de488213aaaa06a785adc5.zip gcc-abb967da1c0d6deb98de488213aaaa06a785adc5.tar.gz gcc-abb967da1c0d6deb98de488213aaaa06a785adc5.tar.bz2 | |
ipa-devirt.c (odr_subtypes_equivalent_p): Fix recursion.
* ipa-devirt.c (odr_subtypes_equivalent_p): Fix recursion.
(warn_types_mismatch): Fix walk of DECL_NAME.
(odr_types_equivalent_p): Fix overactive assert.
* lto/lto-symtab.c (lto_symtab_merge_decls_2): Fix extra space.
* g++.dg/lto/odr-1_0.C: Fix template.
* g++.dg/lto/odr-1_1.C: Fix template.
From-SVN: r265523
Diffstat (limited to 'gcc/lto')
| -rw-r--r-- | gcc/lto/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/lto/lto-symtab.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index c0e9f1c..a5d1ff2 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,7 @@ +2018-10-26 Jan Hubicka <jh@suse.cz> + + * lto/lto-symtab.c (lto_symtab_merge_decls_2): Fix extra space. + 2018-10-17 David Malcolm <dmalcolm@redhat.com> * Make-lang.in (selftest-lto): New. diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c index cf08d45..4b24b84 100644 --- a/gcc/lto/lto-symtab.c +++ b/gcc/lto/lto-symtab.c @@ -698,7 +698,7 @@ lto_symtab_merge_decls_2 (symtab_node *first, bool diagnosed_p) if (level & 2) diag = warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wodr, - "%qD violates the C++ One Definition Rule ", + "%qD violates the C++ One Definition Rule", decl); if (!diag && (level & 1)) diag = warning_at (DECL_SOURCE_LOCATION (decl), |