Backport r259431

2018-04-25  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2018-04-17  Martin Liska  <mliska@suse.cz>

	PR lto/85405
	* ipa-devirt.c (odr_types_equivalent_p): Remove trailing
	in message, remote space in between '_G' and '('.

From-SVN: r259634

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b7bb3d436f9dbd202c59070a1f3dd4b292a842da..a2fa483b3cda25d1c2dd395000cabfcd330240cc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-25  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2018-04-17  Martin Liska  <mliska@suse.cz>
+
+       PR lto/85405
+       * ipa-devirt.c (odr_types_equivalent_p): Remove trailing
+       in message, remote space in between '_G' and '('.
+
 2018-04-25  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index b4d2a94858fd68a918e9b1a45f48e0abbd92f65e..0d06c3c237a7153bf5ee2818756266bc04c1d144 100644 (file)
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1579,7 +1579,7 @@ odr_types_equivalent_p (tree t1, tree t2, bool warn, bool *warned,
                if (DECL_BIT_FIELD (f1) != DECL_BIT_FIELD (f2))
                  {
                    warn_odr (t1, t2, f1, f2, warn, warned,
-                             G_ ("one field is bitfield while other is not "));
+                             G_("one field is bitfield while other is not"));
                    return false;
                  }
                else