From 4e3f6d8529cfab76897fa4f1618409efdd468ae7 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 3 Dec 2009 19:26:27 -0500
Subject: [PATCH] re PR c++/42266 ([C++0x] ICE with decltype and variadic
templates)
PR c++/42266
* cvt.c (convert_from_reference): Do nothing if TREE_TYPE is null.
From-SVN: r154964
---
gcc/cp/ChangeLog | 5 ++++
gcc/cp/cvt.c | 3 ++-
gcc/testsuite/ChangeLog | 5 ++++
gcc/testsuite/g++.dg/cpp0x/variadic97.C | 35 +++++++++++++++++++++++++
4 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/variadic97.C
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f11ee70f0408..deb59030bd00 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03 Jason Merrill <jason@redhat.com>
+
+ PR c++/42266
+ * cvt.c (convert_from_reference): Do nothing if TREE_TYPE is null.
+
2009-12-03 Dodji Seketeli <dodji@redhat.com>
PR c++/42217
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 8c5b001dd15c..6f3b56e43ce6 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -506,7 +506,8 @@ convert_to_reference (tree reftype, tree expr, int convtype,
tree
convert_from_reference (tree val)
{
- if (TREE_CODE (TREE_TYPE (val)) == REFERENCE_TYPE)
+ if (TREE_TYPE (val)
+ && TREE_CODE (TREE_TYPE (val)) == REFERENCE_TYPE)
{
tree t = TREE_TYPE (TREE_TYPE (val));
tree ref = build1 (INDIRECT_REF, t, val);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0f9311b577b8..ff7a355f451b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-03 Jason Merrill <jason@redhat.com>
+
+ PR c++/42266
+ * g++.dg/cpp0x/variadic97.C: New.
+
2009-12-03 Jakub Jelinek <jakub@redhat.com>
PR middle-end/42049
diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic97.C b/gcc/testsuite/g++.dg/cpp0x/variadic97.C
new file mode 100644
index 000000000000..a2070319ebd3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/variadic97.C
@@ -0,0 +1,35 @@
+// PR c++/42266
+// { dg-options -std=c++0x }
+
+template<typename... _Elements>
+ class tuple;
+
+template<typename _Arg>
+ class _Mu;
+
+template<typename _Signature>
+ struct _Bind;
+
+template<typename _Functor, typename... _Bound_args>
+ class _Bind<_Functor(_Bound_args...)>
+ {
+ template<typename... _Args, typename
+ = decltype(_Functor()(_Mu<_Bound_args>()(_Bound_args(),
+ tuple<_Args...>())...) )>
+ void __call() { }
+ };
+
+template<typename _Functor, typename _Arg>
+ _Bind<_Functor(_Arg)>
+ bind(_Functor, _Arg) { }
+
+struct State
+{
+ bool ready() { return true; }
+
+ void f()
+ {
+ bind(&State::ready, this);
+ }
+};
+
--
GitLab