OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/47200 ([C++0x] ICE: in adjust_temp_type, at cp/semantics.c:5821 with missing definition of constexpr function) 

PR c++/47200
	* semantics.c (cxx_bind_parameters_in_call): Don't call
	adjust_temp_type on non-constant args.

From-SVN: r170620
This commit is contained in:
Jason Merrill 2011-03-02 13:18:31 -05:00 committed by Jason Merrill
parent f158c8d0ed
commit c6f54c7aa7
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,5 +1,9 @@
2011-03-01 Jason Merrill <jason@redhat.com>
PR c++/47200
* semantics.c (cxx_bind_parameters_in_call): Don't call
adjust_temp_type on non-constant args.
PR c++/47851
* call.c (standard_conversion): Provide requested cv-quals on
class rvalue conversion.

3
gcc/cp/semantics.c
View File

@ -5906,6 +5906,9 @@ cxx_bind_parameters_in_call (const constexpr_call *old_call, tree t,
/* Just discard ellipsis args after checking their constantitude. */
if (!parms)
continue;
if (*non_constant_p)
/* Don't try to adjust the type of non-constant args. */
goto next;
/* Make sure the binding has the same type as the parm. */
if (TREE_CODE (type) != REFERENCE_TYPE)

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2011-03-01 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/constexpr-non-const-arg2.C: New.
2011-03-02 Richard Sandiford <richard.sandiford@linaro.org>
PR rtl-optimization/47925

16
gcc/testsuite/g++.dg/cpp0x/constexpr-non-const-arg2.C Normal file
View File

@ -0,0 +1,16 @@
// PR c++/47200
// { dg-options "-std=c++0x -w" }
template < int > struct duration
{
constexpr int count ();
static constexpr duration min ();
};
constexpr int
f (duration < 0 > d, duration < 0 > )
{
return d.count ();
}
static_assert (f (duration < 0 >::min (), duration < 0 > ()), ""); // { dg-error "non-constant|before its definition" }