yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

c++: Remove GCC12 FIXME for DR1312

Browse Source 
This patch removes a FIXME I left for myself for GCC 12, along with
adjusting the relevant test.

gcc/cp/ChangeLog:

	DR 1312
	* constexpr.c (cxx_eval_constant_expression): Don't check
	integer_zerop.

gcc/testsuite/ChangeLog:

	DR 1312
	* g++.dg/cpp0x/constexpr-cast2.C: Remove XFAILs.
This commit is contained in:
Marek Polacek
2021-04-28 19:11:14 -04:00
parent 0871fe27c2
commit 6252e35cf5
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gcc/cp/constexpr.c
+1 -2
View File
@@ -6745,8 +6745,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t,
/* [expr.const]: a conversion from type cv void* to a pointer-to-object
type cannot be part of a core constant expression as a resolution to
DR 1312. */
if (integer_zerop (op) /* FIXME: Remove in GCC 12. */
&& TYPE_PTROB_P (type)
if (TYPE_PTROB_P (type)
&& TYPE_PTR_P (TREE_TYPE (op))
&& VOID_TYPE_P (TREE_TYPE (TREE_TYPE (op)))
/* Inside a call to std::construct_at or to
gcc/testsuite/g++.dg/cpp0x/constexpr-cast2.C
+3 -3
View File
@@ -6,11 +6,11 @@ static int i;
constexpr void *vp0 = nullptr;
constexpr void *vpi = &i;
constexpr int *p1 = (int *) vp0; // { dg-error "cast from .void\\*. is not allowed" }
constexpr int *p2 = (int *) vpi; // { dg-error "cast from .void\\*. is not allowed" "integer_zerop" { xfail *-*-* } }
constexpr int *p2 = (int *) vpi; // { dg-error "cast from .void\\*. is not allowed" }
constexpr int *p3 = static_cast<int *>(vp0); // { dg-error "cast from .void\\*. is not allowed" }
constexpr int *p4 = static_cast<int *>(vpi); // { dg-error "cast from .void\\*. is not allowed" "integer_zerop" { xfail *-*-* } }
constexpr int *p4 = static_cast<int *>(vpi); // { dg-error "cast from .void\\*. is not allowed" }
constexpr void *p5 = vp0;
constexpr void *p6 = vpi;
constexpr int *pi = &i;
constexpr bool b = ((int *)(void *) pi == pi); // { dg-error "cast from .void\\*. is not allowed" "integer_zerop" { xfail *-*-* } }
constexpr bool b = ((int *)(void *) pi == pi); // { dg-error "cast from .void\\*. is not allowed" }