From patchwork Tue Jan 31 13:27:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 64011 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0C06238468CB for ; Tue, 31 Jan 2023 13:28:32 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id 3863D395BC43 for ; Tue, 31 Jan 2023 13:23:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3863D395BC43 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wr1-x436.google.com with SMTP id a3so7495863wrt.6 for ; Tue, 31 Jan 2023 05:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wjN3tnLbFkTGHnQwXj2kSODEvG0RcKAUT+bVO+lajWk=; b=SyFxuE2NK1dZm5Jv2XeQ/avNEFQJphmkWpXvPUXVD6r6DQwg1M2zrb8BsU9bLHehaN GpZWa1o7xOPXDv+F0tK4lq5+N0BGzv4ee9Hs8YE3EtvJrnLmdbp2G0/uT0QpeHkoRjn+ P4ETZo8S88LdJqW2PuovcMnIIiWCRkKy/jse08X/gp1nZXtrvjhy7TvOjQpxI4713W8z F4c8cEWzfjs0cWE+CUdHegUJXSNH8w+jcegczP6vF/xBlOnPkpG45DL/fUHb3OpFbmpo AuJc9214CtwI4Ctk4x+O+ueZNcRvd7543KSk/nOG0hkn5EDtiw4oC8YNyhhGXWI/OEBz +7xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wjN3tnLbFkTGHnQwXj2kSODEvG0RcKAUT+bVO+lajWk=; b=PXS809wKAAOEHW0srNEetcESuY+S55atbE+xqnIDs/05uauYhUlQgFri36s7qRLu4v k8deuWI6dPhQPV1wrLWzoX1yOAluJO0AQYRL6axbRPJt8BGo/S1S+hJkXt4ik+U34qfC Z2OhBTB2bD/FT80Usk2sed0X3o+7lN+CMkyNYmKCWnDwcpWD6MwCBIE3WFwu7T0ad2in ApRsYtgoy9tf/7j8HQSviKCCDePjKK2T6VDoBBbVOaTDWNb1SmbmNUP6MGz7K9PGq++A I0Y/We2AfYlGAteSV4RS3+1JcXobXRIkoDYXo/nZ0DIGjoFtBsvZVEpzMGlqsnXOwIMn tDZg== X-Gm-Message-State: AFqh2kpbspC184a2+D59upfI5E9Dr+o3jzsGaZb5TuxD15bmaOszgX0b tbCFUptxLcu5SEmBSpcNIhsHz3JPm3cEXGjgBw== X-Google-Smtp-Source: AMrXdXubTd5rTKMyMgEBEc+sSGfLkAQ51k8AY8vuFuZGyP0k01j9/9RVoDSoX9NW2ytstRJDaKg5PA== X-Received: by 2002:a05:6000:1d92:b0:2be:50b1:c0e with SMTP id bk18-20020a0560001d9200b002be50b10c0emr33769406wrb.38.1675171414777; Tue, 31 Jan 2023 05:23:34 -0800 (PST) Received: from platypus.lan ([2001:861:5e4c:3bb0:6424:328a:1734:3249]) by smtp.gmail.com with ESMTPSA id n6-20020adff086000000b002bdbead763csm15180831wro.95.2023.01.31.05.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 05:23:34 -0800 (PST) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [COMMITTED] gccrs: Make constexpr constructors type-checking more permissive Date: Tue, 31 Jan 2023 14:27:20 +0100 Message-Id: <20230131132720.663907-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-15.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Philip Herron gcc/rust/ChangeLog: * backend/rust-constexpr.cc (eval_store_expression): Remove invalid assertion on constexpr constructors. Tested on x86_64-pc-linux-gnu, committed on master. --- 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;