From: Jason Merrill <jason@redhat.com>
To: Jakub Jelinek <jakub@redhat.com>
Cc: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] c++: Don't shortcut TREE_CONSTANT vector type CONSTRUCTORs in cxx_eval_constant_expression [PR107295]
Date: Thu, 20 Oct 2022 10:51:14 -0400 [thread overview]
Message-ID: <ae97e0b0-d3c2-6700-e7db-d3ef14d42447@redhat.com> (raw)
In-Reply-To: <Y0+rxzMBPmFcWzqe@tucnak>
On 10/19/22 03:48, Jakub Jelinek wrote:
> Hi!
>
> The excess precision support broke building skia (dependency of firefox)
> on ia32 (it has something like the a constexpr variable), but as the other
> cases show, it is actually a preexisting problem if one uses casts from
> constants with wider floating point types.
> The problem is that cxx_eval_constant_expression tries to short-cut
> processing of TREE_CONSTANT CONSTRUCTORs if they satisfy
> reduced_constant_expression_p - instead of calling cxx_eval_bare_aggregate
> on them it just verifies flags and if they are TREE_CONSTANT even after
> that, just fold.
> Now, on the testcase we have a TREE_CONSTANT CONSTRUCTOR containing
> TREE_CONSTANT NOP_EXPR of REAL_CST. And, fold, which isn't recursive,
> doesn't optimize that into VECTOR_CST, while later on we are only able
> to optimize VECTOR_CST arithmetics, not arithmetics with vector
> CONSTRUCTORs.
> The following patch fixes that by only returning what fold returned
> if for vector types it returned VECTOR_CST, otherwise let us
> call cxx_eval_bare_aggregate. That function will try to constant
> evaluate all the elements and if anything changes, return a CONSTRUCTOR,
> in the vector type cases with fold called on it at the end.
> Now, just calling cxx_eval_bare_aggregate for vector types doesn't work
> either (e.g. constexpr-builtin4.C breaks), because cxx_eval_bare_aggregate
> if nothing changes (like all elts are already REAL_CSTs or INTEGER_CSTs)
> will return the old CONSTRUCTOR and nothing folds it into a VECTOR_CST.
That seems like a bug; for VECTOR_TYPE we should fold even if !changed.
> Also, the reason for the short-cutting is I think trying to avoid
> allocating a new CONSTRUCTOR when nothing changes and we just create
> GC garbage by it.
We might limit the shortcut to non-vector types by hoisting the vector
check in reduced_constant_expression_p out of the
CONSTRUCTOR_NO_CLEARING condition:
> if (CONSTRUCTOR_NO_CLEARING (t))
> {
> if (TREE_CODE (TREE_TYPE (t)) == VECTOR_TYPE)
> /* An initialized vector would have a VECTOR_CST. */
> return false;
then we could remove the fold in the shortcut.
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
>
> 2022-10-19 Jakub Jelinek <jakub@redhat.com>
>
> PR c++/107295
> * constexpr.cc (cxx_eval_constant_expression) <case CONSTRUCTOR>:
> Don't short-cut TREE_CONSTANT vector ctors if fold doesn't turn them
> into VECTOR_CST.
>
> * g++.dg/ext/vector42.C: New test.
>
> --- gcc/cp/constexpr.cc.jj 2022-10-17 12:29:33.518016420 +0200
> +++ gcc/cp/constexpr.cc 2022-10-19 01:29:28.761935708 +0200
> @@ -7391,7 +7391,12 @@ cxx_eval_constant_expression (const cons
> VECTOR_CST if applicable. */
> verify_constructor_flags (t);
> if (TREE_CONSTANT (t))
> - return fold (t);
> + {
> + r = fold (t);
> + if (TREE_CODE (TREE_TYPE (t)) != VECTOR_TYPE
> + || TREE_CODE (r) == VECTOR_CST)
> + return r;
> + }
> }
> r = cxx_eval_bare_aggregate (ctx, t, lval,
> non_constant_p, overflow_p);
> --- gcc/testsuite/g++.dg/ext/vector42.C.jj 2022-10-18 12:33:42.938510483 +0200
> +++ gcc/testsuite/g++.dg/ext/vector42.C 2022-10-18 12:32:27.448544476 +0200
> @@ -0,0 +1,12 @@
> +// PR c++/107295
> +// { dg-do compile { target c++11 } }
> +
> +template <typename T> struct A {
> + typedef T __attribute__((vector_size (sizeof (int)))) V;
> +};
> +template <int, typename T> using B = typename A<T>::V;
> +template <typename T> using V = B<4, T>;
> +using F = V<float>;
> +constexpr F a = F () + 0.0f;
> +constexpr F b = F () + (float) 0.0;
> +constexpr F c = F () + (float) 0.0L;
>
> Jakub
>
next prev parent reply other threads:[~2022-10-20 14:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 7:48 Jakub Jelinek
2022-10-20 14:51 ` Jason Merrill [this message]
2022-10-21 7:30 ` [PATCH] c++, v2: " Jakub Jelinek
2022-10-21 13:19 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ae97e0b0-d3c2-6700-e7db-d3ef14d42447@redhat.com \
--to=jason@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).