diff options
| author | Jason Merrill <jason@redhat.com> | 2009-12-03 19:26:27 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-12-03 19:26:27 -0500 |
| commit | 4e3f6d8529cfab76897fa4f1618409efdd468ae7 (patch) | |
| tree | e745476cee107dd96de085065c0ae190e6f0a213 | |
| parent | 8414ab11977b9f0bcff11491e98e733899afb072 (diff) | |
| download | gcc-4e3f6d8529cfab76897fa4f1618409efdd468ae7.zip gcc-4e3f6d8529cfab76897fa4f1618409efdd468ae7.tar.gz gcc-4e3f6d8529cfab76897fa4f1618409efdd468ae7.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic97.C | 35 |
4 files changed, 47 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f11ee70..deb5903 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 8c5b001..6f3b56e 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 0f9311b..ff7a355 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 0000000..a207031 --- /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); + } +}; + |