From patchwork Sat Jul 1 14:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 115041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp11065441vqr; Sat, 1 Jul 2023 07:14:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlGf/Mgab5B5Y4ietQj0fxmvzB5cKo9mA5eRCxZ9VbA8HSgukdwb5xfRIqHDshdYy6TRJrvj X-Received: by 2002:a17:907:984b:b0:982:8de1:aad9 with SMTP id jj11-20020a170907984b00b009828de1aad9mr3906687ejc.64.1688220898862; Sat, 01 Jul 2023 07:14:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688220898; cv=none; d=google.com; s=arc-20160816; b=GScIQVY138nQl2dJkAO9i+3OP7Nqa8r1JENXuWYSMKpqvEruZ9nOlIYI5q35BuHcx/ ZaAc312aVM+GBpDsQ8F+rK2ObK+S8wCS65EiEmkaE7wTRyPI6Qc2s3pJGPN9TspABetg tN0/fiUlicajWZ6AaJ7zqLvjQLRmhfSkMEaaafZhD4eFus8ie+7PNA7VeRbf0s2acj2Z 6sT/ew6IH6wgbie4GFqoK2c+A632nyQNlYo7zWrmcl55h2pV/RvtG524aq5vBDL616Le DK+ZabKzwrYHxN7C57wNcCPb4lkMeNQ7FnP8G23TgOOnocZGWXFIYzOUkb5Ok73Ou0Mz +lcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=TJpwOE7/g88DYB1EZiLPjY8vkdq2llGSbJjXp84cRRw=; fh=D2tRalIjW6KCgVuqwFHStdMb9uqe8HSQc2WEvRJ6uLE=; b=cZAnAiRUkKp4XJZhUkRa+HGuRVZ/wEckKWvZrlmwpDGZUHJsJ3DgF5igxnqIvVbkaw /VptbbQXxkqWVG9w9gXdGtSI8U9yGhD1nH5HonWQTPqJbxxlu/0XZWVKA/JztjFs+/Ut SLZ6pDSuKNDEmgdtav2nzLu7NVEi5nURouEoJX8LnjyXMWnxZIAmxuikZKIFGzQMvqi4 IuqMgzlG63EsIl8ZcOMahcpieAjXYp8sHvn1hnCXCzdv56XbKMMg0oUAY9JOAIANu+Pv de6Ea3LZ0CoHsZoJkp58SVNzpoYOwYyFpxdrWeMZu7LeYn5ent9ctCtEK13rgxRwXsP3 jrJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=yuzLdGkQ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id bl22-20020a170906c25600b0098715ee4313si1387032ejb.72.2023.07.01.07.14.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jul 2023 07:14:58 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=yuzLdGkQ; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B9BC43858C60 for ; Sat, 1 Jul 2023 14:14:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B9BC43858C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688220897; bh=TJpwOE7/g88DYB1EZiLPjY8vkdq2llGSbJjXp84cRRw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=yuzLdGkQk7aBgfDRJFjZFXtLF3+1ZkIz8/4/4a55/hv8kzSk9Z4hy3A7g/nqI1yBp 6y8lMJw+JNNG6glY7GiHmHc+S833SlNu14xNzvljebmucsfyI/AOJkSybVYZyfVPvI K4WJNvLaQquUEsXn4YMjAh3TJ296iMiT8nf8f9y8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by sourceware.org (Postfix) with ESMTPS id 0B28C3858D35 for ; Sat, 1 Jul 2023 14:14:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B28C3858D35 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4QtZ1b5tbQz9sRM; Sat, 1 Jul 2023 16:14:11 +0200 (CEST) To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [GCC 11][committed] d: Fix ICE in setValue, at d/dmd/dinterpret.c:7013 Date: Sat, 1 Jul 2023 16:14:10 +0200 Message-Id: <20230701141410.2891380-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770227917651465410?= X-GMAIL-MSGID: =?utf-8?q?1770227917651465410?= Hi, This patch backports ICE fix from upstream which is already part of GCC-12 and later. When casting null to integer or real, instead of painting the type on the NullExp, we emplace an IntegerExp/RealExp with the value zero. Same as when casting from NullExp to bool. Bootstrapped and regression tested on x86_64-linux-gnu, committed to releases/gcc-11, and backported to releases/gcc-10. Regards, Iain. --- Reviewed-on: https://github.com/dlang/dmd/pull/13172 PR d/110511 gcc/d/ChangeLog: * dmd/dinterpret.c (Interpreter::visit (CastExp *)): Handle casting null to int or float. gcc/testsuite/ChangeLog: * gdc.test/compilable/test21794.d: New test. --- gcc/d/dmd/dinterpret.c | 12 ++++- gcc/testsuite/gdc.test/compilable/test21794.d | 52 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gdc.test/compilable/test21794.d diff --git a/gcc/d/dmd/dinterpret.c b/gcc/d/dmd/dinterpret.c index ab9d88c660c..d4cfb0caacb 100644 --- a/gcc/d/dmd/dinterpret.c +++ b/gcc/d/dmd/dinterpret.c @@ -5792,12 +5792,22 @@ public: } if (e->to->ty == Tsarray) e1 = resolveSlice(e1); - if (e->to->toBasetype()->ty == Tbool && e1->type->ty == Tpointer) + Type *tobt = e->to->toBasetype(); + if (tobt->ty == Tbool && e1->type->ty == Tpointer) { new(pue) IntegerExp(e->loc, e1->op != TOKnull, e->to); result = pue->exp(); return; } + else if (tobt->isTypeBasic() && e1->op == TOKnull) + { + if (tobt->isintegral()) + new(pue) IntegerExp(e->loc, 0, e->to); + else if (tobt->isreal()) + new(pue) RealExp(e->loc, CTFloat::zero, e->to); + result = pue->exp(); + return; + } result = ctfeCast(pue, e->loc, e->type, e->to, e1); } diff --git a/gcc/testsuite/gdc.test/compilable/test21794.d b/gcc/testsuite/gdc.test/compilable/test21794.d new file mode 100644 index 00000000000..68e504bce56 --- /dev/null +++ b/gcc/testsuite/gdc.test/compilable/test21794.d @@ -0,0 +1,52 @@ +// https://issues.dlang.org/show_bug.cgi?id=21794 +/* +TEST_OUTPUT: +--- +0 +0u +0L +0LU +0.0F +0.0 +0.0L +--- +*/ + +bool fun(void* p) { + const x = cast(ulong)p; + return 1; +} + +static assert(fun(null)); + +T fun2(T)(void* p) { + const x = cast(T)p; + return x; +} + +// These were an error before, they were returning a NullExp instead of IntegerExp/RealExp + +static assert(fun2!int(null) == 0); +static assert(fun2!uint(null) == 0); +static assert(fun2!long(null) == 0); +static assert(fun2!ulong(null) == 0); +static assert(fun2!float(null) == 0); +static assert(fun2!double(null) == 0); +static assert(fun2!real(null) == 0); + +// These were printing 'null' instead of the corresponding number + +const i = cast(int)null; +const ui = cast(uint)null; +const l = cast(long)null; +const ul = cast(ulong)null; +const f = cast(float)null; +const d = cast(double)null; +const r = cast(real)null; +pragma(msg, i); +pragma(msg, ui); +pragma(msg, l); +pragma(msg, ul); +pragma(msg, f); +pragma(msg, d); +pragma(msg, r);