mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-11 13:01:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/48557 ([C++0x][SFINAE] Hard errors with void as operand of binary built-in operators)

Browse Source 
PR c++/48557
	* typeck.c (cp_build_binary_op): Don't decay void operands.

From-SVN: r172433
This commit is contained in:
Jason Merrill 2011-04-14 11:00:07 -04:00 committed by Jason Merrill
parent fe5b5c364b
commit a66e8081b5
4 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
2011-04-14 Jason Merrill <jason@redhat.com>
PR c++/48557
* typeck.c (cp_build_binary_op): Don't decay void operands.
PR c++/48446
* decl.c (compute_array_index_type): Use get_temp_regvar instead
of variable_size.

8
gcc/cp/typeck.c
View File

@ -3646,16 +3646,16 @@ cp_build_binary_op (location_t location,
|| code == TRUTH_OR_EXPR || code == TRUTH_ORIF_EXPR
|| code == TRUTH_XOR_EXPR)
{
if (!really_overloaded_fn (op0))
if (!really_overloaded_fn (op0) && !VOID_TYPE_P (TREE_TYPE (op0)))
op0 = decay_conversion (op0);
if (!really_overloaded_fn (op1))
if (!really_overloaded_fn (op1) && !VOID_TYPE_P (TREE_TYPE (op1)))
op1 = decay_conversion (op1);
}
else
{
if (!really_overloaded_fn (op0))
if (!really_overloaded_fn (op0) && !VOID_TYPE_P (TREE_TYPE (op0)))
op0 = default_conversion (op0);
if (!really_overloaded_fn (op1))
if (!really_overloaded_fn (op1) && !VOID_TYPE_P (TREE_TYPE (op1)))
op1 = default_conversion (op1);
}

2
gcc/testsuite/ChangeLog
View File

@ -1,5 +1,7 @@
2011-04-14 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/sfinae14.C: New.
* g++.dg/ext/vla10.C: New.
2011-04-14 Richard Guenther <rguenther@suse.de>

27
gcc/testsuite/g++.dg/cpp0x/sfinae14.C Normal file
View File

@ -0,0 +1,27 @@
// PR c++/48557
// { dg-options -std=c++0x }
template<class T>
struct add_rval_ref
{
typedef T&& type;
};
template<>
struct add_rval_ref<void>
{
typedef void type;
};
template<class T>
typename add_rval_ref<T>::type create();
template<class T, class U,
class = decltype(create<T>() + create<U>())
>
char f(int);
template<class, class>
char (&f(...))[2];
static_assert(sizeof(f<void, int>(0)) != 1, "Error"); // (a)