Commit a6deb68d by Jason Merrill

c++: Handle multiple aggregate overloads [PR95319].

Here, when considering the two 'insert' overloads, we look for aggregate
conversions from the same initializer-list to B<3> or
initializer_list<B<3>>.  But since my fix for reshape_init overhead on the
PR14179 testcase we reshaped the initializer-list directly, leading to an
error when we then tried to reshape it differently for the second overload.

gcc/cp/ChangeLog:

	PR c++/95319
	* decl.c (reshape_init_array_1): Don't reuse in overload context.

gcc/testsuite/ChangeLog:

	PR c++/95319
	* g++.dg/cpp0x/initlist-array12.C: New test.

(cherry picked from commit 6efa97ea1d2fe6df1fbb9df78faaa2248a8618d7)
parent ee6fe844
...@@ -6024,8 +6024,10 @@ reshape_init_array_1 (tree elt_type, tree max_index, reshape_iter *d, ...@@ -6024,8 +6024,10 @@ reshape_init_array_1 (tree elt_type, tree max_index, reshape_iter *d,
/* The initializer for an array is always a CONSTRUCTOR. If this is the /* The initializer for an array is always a CONSTRUCTOR. If this is the
outermost CONSTRUCTOR and the element type is non-aggregate, we don't need outermost CONSTRUCTOR and the element type is non-aggregate, we don't need
to build a new one. */ to build a new one. But don't reuse if not complaining; if this is
tentative, we might also reshape to another type (95319). */
bool reuse = (first_initializer_p bool reuse = (first_initializer_p
&& (complain & tf_error)
&& !CP_AGGREGATE_TYPE_P (elt_type) && !CP_AGGREGATE_TYPE_P (elt_type)
&& !TREE_SIDE_EFFECTS (first_initializer_p)); && !TREE_SIDE_EFFECTS (first_initializer_p));
if (reuse) if (reuse)
......
// PR c++/95319
// { dg-do compile { target c++11 } }
namespace std {
template <class> class initializer_list {
int *_M_array;
unsigned long _M_len;
};
template <int _Nm> struct A { typedef int _Type[_Nm]; };
template <int _Nm> struct B { typename A<_Nm>::_Type _M_elems; };
class C {
public:
void insert(int, B<3>);
void insert(int, initializer_list<B<3>>);
};
} // namespace std
int a;
int
main() {
using ArrayVector = std::C;
auto b = ArrayVector();
b.insert(a, {{2}});
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment