From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 0F228385800D; Tue, 27 Sep 2022 15:49:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F228385800D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1664293788; bh=w8JS3koL+JNAywUCUT7jY7QW8GrhJx87zD1wM/BcVWI=; h=From:To:Subject:Date:From; b=f1phtJ5r6Dq19IW4vDzzpG2Vl5r01M3JHtpDpdNxsTyvNzwgOkz0u8VvNQ+IolSbF FbchUA2VPJnAci28n6WGgNXid9MtEfIdpihWxRvD1/n0U7+FE0DBCOowSqQ6RFmpBv oJT8XqJxgHNpbY7QQItdK7rUx1Ix6Gip3rgM8Mc8= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Make constexpr constructors type-checking more permissive X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: af3b5be6c99f359691b15001ed04d0d457841ba8 X-Git-Newrev: 3a24dde2e7adec97243b95c79ea7877698f17c19 Message-Id: <20220927154948.0F228385800D@sourceware.org> Date: Tue, 27 Sep 2022 15:49:48 +0000 (GMT) List-Id: https://gcc.gnu.org/g:3a24dde2e7adec97243b95c79ea7877698f17c19 commit 3a24dde2e7adec97243b95c79ea7877698f17c19 Author: Philip Herron Date: Tue Sep 27 11:36:35 2022 +0100 Make constexpr constructors type-checking more permissive Diff: --- gcc/rust/backend/rust-constexpr.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/rust/backend/rust-constexpr.cc b/gcc/rust/backend/rust-constexpr.cc index 203449ba906..790a8e966a0 100644 --- a/gcc/rust/backend/rust-constexpr.cc +++ b/gcc/rust/backend/rust-constexpr.cc @@ -2953,14 +2953,14 @@ eval_store_expression (const constexpr_ctx *ctx, tree t, bool lval, TREE_SIDE_EFFECTS (*valp) = TREE_SIDE_EFFECTS (init); CONSTRUCTOR_NO_CLEARING (*valp) = CONSTRUCTOR_NO_CLEARING (init); } - else if (TREE_CODE (init) == CONSTRUCTOR - && !same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (init), - type)) - { - /* See above on initialization of empty bases. */ - gcc_assert (is_empty_class (TREE_TYPE (init)) && !lval); - return init; - } + // else if (TREE_CODE (init) == CONSTRUCTOR + // && !same_type_ignoring_top_level_qualifiers_p (TREE_TYPE (init), + // type)) + // { + // /* See above on initialization of empty bases. */ + // // gcc_assert (is_empty_class (TREE_TYPE (init)) && !lval); + // return init; + // } else *valp = init;