From 851285595028bdbb0eed29766e6eece1a884138e Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Thu, 14 Apr 2016 16:51:16 +0000
Subject: [PATCH] re PR c++/70029 (ICE with C++11 and -flto)

	PR c++/70029
	* tree.c (verify_type): Disable the canonical type of main variant
	check.

	* g++.dg/torture/pr70029.C: New test.

Co-Authored-By: Jan Hubicka <hubicka@ucw.cz>

From-SVN: r234979
---
 gcc/ChangeLog                          |  7 +++++++
 gcc/testsuite/ChangeLog                |  6 ++++++
 gcc/testsuite/g++.dg/torture/pr70029.C | 12 ++++++++++++
 gcc/tree.c                             |  4 +++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/torture/pr70029.C

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e56d15bc40d..c4a0759cedc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2016-04-14  Marek Polacek  <polacek@redhat.com>
+	    Jan Hubicka  <hubicka@ucw.cz>
+
+	PR c++/70029
+	* tree.c (verify_type): Disable the canonical type of main variant
+	check.
+
 2016-04-14  Jason Merrill  <jason@redhat.com>
 
 	* cfgexpand.c, expr.c: Revert previous change.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b7c5d3c632c..9cd0c6ce0e8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-14  Marek Polacek  <polacek@redhat.com>
+	    Jan Hubicka  <hubicka@ucw.cz>
+
+	PR c++/70029
+	* g++.dg/torture/pr70029.C: New test.
+
 2016-04-14  Martin Sebor  <msebor@redhat.com>
 
 	* g++.dg/cpp1y/vla11.C: Avoid using attribute aligned to increase
diff --git a/gcc/testsuite/g++.dg/torture/pr70029.C b/gcc/testsuite/g++.dg/torture/pr70029.C
new file mode 100644
index 00000000000..9592f0cc987
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr70029.C
@@ -0,0 +1,12 @@
+// PR c++/70029
+// { dg-do compile }
+// { dg-options "-std=c++11 -g -flto" }
+// { dg-require-effective-target lto }
+
+struct A
+{
+  A();
+  int foo() && __attribute__ ((__warn_unused_result__)) { return 0; }
+};
+
+A a;
diff --git a/gcc/tree.c b/gcc/tree.c
index ed28429b1e1..c64d7204acb 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -13584,7 +13584,9 @@ verify_type (const_tree t)
       debug_tree (ct);
       error_found = true;
     }
-  if (TYPE_MAIN_VARIANT (t) == t && ct && TYPE_MAIN_VARIANT (ct) != ct)
+  /* FIXME: this is violated by the C++ FE as discussed in PR70029, when
+     FUNCTION_*_QUALIFIED flags are set.  */
+  if (0 && TYPE_MAIN_VARIANT (t) == t && ct && TYPE_MAIN_VARIANT (ct) != ct)
    {
       error ("TYPE_CANONICAL of main variant is not main variant");
       debug_tree (ct);