From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 8E3133858C00; Tue, 31 Jan 2023 13:17:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8E3133858C00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675171045; bh=wsQ8OmFZcs621ecsAXwof7CE4eXbwRxfVP3PTFpUUaM=; h=From:To:Subject:Date:From; b=NfbOluExU52F91NVaoH6lWKdsTBsbXx6NzfyMfRMaosG7oXSL3y1A1ji67s/8F0rp qEExC/BvsjGgrBUe/KjljwOQCp09mEfKDDbTL0i8LHN0zM2sgcEqd6flbOH5eWqHxd aGQF+o3/aQ6N0QUF36yZT4IyxbNBTvaKqH3p31nY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5571] gccrs: Make constexpr constructors type-checking more permissive X-Act-Checkin: gcc X-Git-Author: Philip Herron X-Git-Refname: refs/heads/master X-Git-Oldrev: e1beb624ff5aca1b0e2a98569c93a91fad99fd63 X-Git-Newrev: 9c60f0e1e5cd5a60d5a057193611aa0c38894cc7 Message-Id: <20230131131725.8E3133858C00@sourceware.org> Date: Tue, 31 Jan 2023 13:17:25 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9c60f0e1e5cd5a60d5a057193611aa0c38894cc7 commit r13-5571-g9c60f0e1e5cd5a60d5a057193611aa0c38894cc7 Author: Philip Herron Date: Tue Sep 27 11:36:35 2022 +0100 gccrs: Make constexpr constructors type-checking more permissive gcc/rust/ChangeLog: * backend/rust-constexpr.cc (eval_store_expression): Remove invalid assertion on constexpr constructors. 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 8efb4301d09..8623816236c 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;