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

re PR c++/87506 (ICE with inherited constexpr constructor with const argument)

Browse Source 
PR c++/87506
	* constexpr.c (adjust_temp_type): Handle EMPTY_CLASS_EXPR.

	* g++.dg/cpp0x/constexpr-87506.C: New test.

From-SVN: r266877
This commit is contained in:
Jakub Jelinek 2018-12-07 00:25:10 +01:00
parent 3c1eaf67e9
commit ff8ba86f44
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-07 Jakub Jelinek <jakub@redhat.com>
PR c++/87506
* constexpr.c (adjust_temp_type): Handle EMPTY_CLASS_EXPR.
2018-12-06 Paolo Carlini <paolo.carlini@oracle.com>
* class.c (check_bitfield_decl): In error message about non-integral
@ -6,7 +11,7 @@
friends; when calling build_decl for a FIELD_DECL possibly pass the
declarator->id_loc.
2018-12-06 Alexandre Oliva <aoliva@redhat.com>
2018-12-06 Alexandre Oliva <aoliva@redhat.com>
PR c++/86747
* pt.c (tsubst_friend_class): Enter tsubsted class context.

2
gcc/cp/constexpr.c
View File

@ -1281,6 +1281,8 @@ adjust_temp_type (tree type, tree temp)
/* Avoid wrapping an aggregate value in a NOP_EXPR. */
if (TREE_CODE (temp) == CONSTRUCTOR)
return build_constructor (type, CONSTRUCTOR_ELTS (temp));
if (TREE_CODE (temp) == EMPTY_CLASS_EXPR)
return build0 (EMPTY_CLASS_EXPR, type);
gcc_assert (scalarish_type_p (type));
return cp_fold_convert (type, temp);
}

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2018-12-07 Jakub Jelinek <jakub@redhat.com>
PR c++/87506
* g++.dg/cpp0x/constexpr-87506.C: New test.
2018-12-06 Paolo Carlini <paolo.carlini@oracle.com>
* g++.dg/parse/bitfield7.C: New.
@ -5,7 +10,7 @@
* g++.dg/parse/bitfield1.C: Likewise.
* g++.dg/parse/bitfield2.C: Likewise.
2018-12-06 Alexandre Oliva <aoliva@redhat.com>
2018-12-06 Alexandre Oliva <aoliva@redhat.com>
PR c++/86747
* g++.dg/pr86747.C: New.

12
gcc/testsuite/g++.dg/cpp0x/constexpr-87506.C Normal file
View File

@ -0,0 +1,12 @@
// PR c++/87506
// { dg-do compile { target c++11 } }
struct A {};
struct B { constexpr B (const A) {} };
struct C : B { using B::B; };
void
foo ()
{
C c (A{});
}