diff options
author | Jakub Jelinek <jakub@redhat.com> | 2021-01-05 17:17:57 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2021-01-05 17:17:57 +0100 |
commit | 606f2af1973d5c83877d327cb5adef97c4243a73 (patch) | |
tree | 8b46777a2e840fe67c20284339fc3f0186527dd6 | |
parent | af362af18f405c34840d820143aa3a94f72fce4d (diff) | |
download | gcc-606f2af1973d5c83877d327cb5adef97c4243a73.zip gcc-606f2af1973d5c83877d327cb5adef97c4243a73.tar.gz gcc-606f2af1973d5c83877d327cb5adef97c4243a73.tar.bz2 |
c++: Fix ICE with __builtin_bit_cast [PR98469]
On the following testcase we ICE during constexpr evaluation (for warnings),
because the IL has ADDR_EXPR of BIT_CAST_EXPR and ADDR_EXPR case asserts
the result is not a CONSTRUCTOR.
The patch punts on lval BIT_CAST_EXPR folding.
> This change is OK, but part of the problem is that we're trying to do
> overload resolution for an S copy/move constructor, which we shouldn't be
> because bit_cast is a prvalue, so in C++17 and up we should use it to
> directly initialize the target without any implied constructor call.
This version therefore wraps it into a TARGET_EXPR then, it alone fixes
the bug, but I've kept the constexpr.c change too.
2021-01-05 Jakub Jelinek <jakub@redhat.com>
PR c++/98469
* constexpr.c (cxx_eval_constant_expression) <case BIT_CAST_EXPR>:
Punt if lval is true.
* semantics.c (cp_build_bit_cast): Call get_target_expr_sfinae on
the result if it has a class type.
* g++.dg/cpp2a/bit-cast8.C: New test.
* g++.dg/cpp2a/bit-cast9.C: New test.
-rw-r--r-- | gcc/cp/constexpr.c | 9 | ||||
-rw-r--r-- | gcc/cp/semantics.c | 4 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/bit-cast8.C | 11 | ||||
-rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/bit-cast9.C | 15 |
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index a299d9a..0c12f60 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -6900,6 +6900,15 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, return t; case BIT_CAST_EXPR: + if (lval) + { + if (!ctx->quiet) + error_at (EXPR_LOCATION (t), + "address of a call to %qs is not a constant expression", + "__builtin_bit_cast"); + *non_constant_p = true; + return t; + } r = cxx_eval_bit_cast (ctx, t, non_constant_p, overflow_p); break; diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 9d2ca30..b448efe 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -10761,6 +10761,10 @@ cp_build_bit_cast (location_t loc, tree type, tree arg, tree ret = build_min (BIT_CAST_EXPR, type, arg); SET_EXPR_LOCATION (ret, loc); + + if (!processing_template_decl && CLASS_TYPE_P (type)) + ret = get_target_expr_sfinae (ret, complain); + return ret; } diff --git a/gcc/testsuite/g++.dg/cpp2a/bit-cast8.C b/gcc/testsuite/g++.dg/cpp2a/bit-cast8.C new file mode 100644 index 0000000..17a4165 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/bit-cast8.C @@ -0,0 +1,11 @@ +// PR c++/98469 +// { dg-do compile { target c++20 } } +// { dg-options "-Wall" } + +struct S { int s; }; + +S +foo () +{ + return __builtin_bit_cast (S, 0); +} diff --git a/gcc/testsuite/g++.dg/cpp2a/bit-cast9.C b/gcc/testsuite/g++.dg/cpp2a/bit-cast9.C new file mode 100644 index 0000000..bf3d368 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/bit-cast9.C @@ -0,0 +1,15 @@ +// PR c++/98469 +// { dg-do compile { target c++20 } } +// { dg-options "-Wall" } + +template<typename T, typename F> +constexpr T +bit_cast (const F &f) noexcept +{ + return __builtin_bit_cast (T, f); +} +struct S { int s; }; +constexpr int foo (const S &x) { return x.s; } +constexpr int bar () { return foo (bit_cast<S> (0)); } +constexpr int x = bar (); +static_assert (!x); |