diff mbox

GCC-5 backport of PR lto/65948

Message ID 5668159D.7090207@suse.cz
State New
Headers show

Commit Message

Martin Liška Dec. 9, 2015, 11:50 a.m. UTC 
Hi.

I would like to backport forgotten patch to GCC-5 branch.
Bootstrap and regression tests have been running, ready after it finishes?

Thanks,
Martin

Comments

Bernd Schmidt Dec. 9, 2015, 12:39 p.m. UTC | #1 
On 12/09/2015 12:50 PM, Martin Liška wrote:
> I would like to backport forgotten patch to GCC-5 branch.
> Bootstrap and regression tests have been running, ready after it finishes?

Ok.


Bernd
diff mbox

Patch

From 626df2a92db87f7c0668c7f2902f314ed6a9bc4c Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Wed, 9 Dec 2015 12:49:22 +0100
Subject: [PATCH] Backport PR lto/65948

---
 gcc/ChangeLog    | 9 +++++++++
 gcc/ipa-devirt.c | 1 +
 2 files changed, 10 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce6f865..067f261 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@ 
+2015-12-09  Martin Liska  <mliska@suse.cz>
+
+	Backport from mainline
+	2015-04-30  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR lto/65948
+	* ipa-devirt.c (odr_types_equivalent_p): NULLPTR_TYPE is equivalent
+	to itself.
+
 2015-12-07  Jakub Jelinek  <jakub@redhat.com>
 
 	Backport from mainline
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index e319785..c165bce 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -1536,6 +1536,7 @@  odr_types_equivalent_p (tree t1, tree t2, bool warn, bool *warned,
 	break;
       }
     case VOID_TYPE:
+    case NULLPTR_TYPE:
       break;
 
     default:
-- 
2.6.3