From: Jakub Jelinek Date: Tue, 5 Jan 2021 16:17:57 +0000 (+0100) Subject: c++: Fix ICE with __builtin_bit_cast [PR98469] X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=606f2af1973d5c83877d327cb5adef97c4243a73;p=gcc.git 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 PR c++/98469 * constexpr.c (cxx_eval_constant_expression) : 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. --- diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index a299d9a3616..0c12f608d36 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 9d2ca304bf0..b448efe024a 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 00000000000..17a416534d7 --- /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 00000000000..bf3d368418f --- /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 +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 (0)); } +constexpr int x = bar (); +static_assert (!x);