From patchwork Wed Oct 16 19:37:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Martin X-Patchwork-Id: 1998207 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nasilyan.com header.i=@nasilyan.com header.a=rsa-sha256 header.s=tey23rxsjton5kop5bydp3vc5ylkyjkg header.b=U3d1c0SP; dkim=pass (1024-bit key; unprotected) header.d=amazonses.com header.i=@amazonses.com header.a=rsa-sha256 header.s=uku4taia5b5tsbglxyj6zym32efj7xqv header.b=DJCxEoqH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XTLpy599Xz1xw2 for ; Thu, 17 Oct 2024 06:38:02 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D156F3858414 for ; Wed, 16 Oct 2024 19:37:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from a6-212.smtp-out.eu-west-1.amazonses.com (a6-212.smtp-out.eu-west-1.amazonses.com [54.240.6.212]) by sourceware.org (Postfix) with ESMTPS id 2AA5D3858CD1 for ; Wed, 16 Oct 2024 19:37:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2AA5D3858CD1 Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=nasilyan.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=eu-west-1.amazonses.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2AA5D3858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=54.240.6.212 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729107459; cv=none; b=BXmBDPHMUaC2zWwC8KeelLryDlEJxk65BvsY7uUlv1YUd8xzg8LMG26lHYQpZlu+PW+JrqN3u1ZQaPhddRcFZbvHeSj2dgGp3BvyeYYw7v/ZK/fMpz3fkS7ygMYSbCAsRNhgiEPMNPXYsAQsrYnnk5r7DaYWSTq0Df06rL3uhHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1729107459; c=relaxed/simple; bh=AN0Xi3CMHsvefR6+T4wl1/cJTN08Wc2eMQZuSHX4AOw=; h=DKIM-Signature:DKIM-Signature:Subject:From:To:Date:Mime-Version: Message-ID; b=sCJWec5d0y4AddxDO50Xq/Rr9Ok3NSD8A5Jh/oFcm/oKhKYAIIriRf52BN6AExZDt+ErKDx+pHssTmRM8k3vBb6L4WBJx1hIv+MAR0K1I6vN7BgqATCw4ZvJYpkRJ241bJyBl5SbqCzmrmdIjvWWaS5gr9h/TbKvv86fTz/LG5c= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=tey23rxsjton5kop5bydp3vc5ylkyjkg; d=nasilyan.com; t=1729107456; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id; bh=AN0Xi3CMHsvefR6+T4wl1/cJTN08Wc2eMQZuSHX4AOw=; b=U3d1c0SPPV6IPQqRmOjNetuYvb3XxcYhu2GqVg5iLNcyuVfiNSqrwBwvyBx4dZHu TMtMzQLtLTRw8KXvBZ6y+C6Yw39TUqhmtaEo+CbiFhFSJoShMnhv/A97nHJxcgBhQ5v S6biw0G68piONgubU4pq74eQzUUCRSCT0MXPII94= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1729107456; h=Subject:From:To:Cc:Date:Mime-Version:Content-Type:Content-Transfer-Encoding:References:Message-Id:Feedback-ID; bh=AN0Xi3CMHsvefR6+T4wl1/cJTN08Wc2eMQZuSHX4AOw=; b=DJCxEoqHPn6fr0N+hQrP+AY1p/vAKTPUL3t66Xt3lbLlp1Rd9HXwvUC7kFdqVvZQ +JldmDydtmjVaj70Kn6lkvPgqcGOj21H5UP76KODeNjh08Ek/+jHHHYVtdtlYj7G2JE QQwvUSCNMHml+iIVVvNxDTvtrD7V8kE2gYowhA+M= Subject: [PATCH] c++: Fix crash during NRV optimization with invalid input [PR117099] From: =?utf-8?q?Simon_Martin?= To: =?utf-8?q?gcc-patches=40gcc=2Egnu=2Eorg?= Cc: =?utf-8?q?jason=40redhat=2Ecom?= Date: Wed, 16 Oct 2024 19:37:36 +0000 Mime-Version: 1.0 References: <20241016193733.77124-1-simon@nasilyan.com> X-Mailer: Amazon WorkMail Thread-Index: AQHbIALZQdWaZDJoQf2wbIryexCO7Q== Thread-Topic: [PATCH] c++: Fix crash during NRV optimization with invalid input [PR117099] X-Original-Mailer: git-send-email 2.44.0 X-Wm-Sent-Timestamp: 1729107455 Message-ID: <0102019296d5f0d6-503071f0-4f6b-4ed0-80b6-9cbf5ebf7a6c-000000@eu-west-1.amazonses.com> Feedback-ID: ::1.eu-west-1.b24dn6frgCi6dh20skzbuMRr7UL8M6Soir/3ogtEjHQ=:AmazonSES X-SES-Outgoing: 2024.10.16-54.240.6.212 X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org We ICE upon the following invalid code because we end up calling finalize_nrv_r with a RETURN_EXPR with no operand. === cut here === struct X { ~X(); }; X test(bool b) { { X x; return x; } if (!(b)) return; } === cut here === This patch fixes this by simply returning error_mark_node when detecting a void return in a function returning non-void. Successfully tested on x86_64-pc-linux-gnu. PR c++/117099 gcc/cp/ChangeLog: * typeck.cc (check_return_expr): Return error_mark_node upon void return for function returning non-void. gcc/testsuite/ChangeLog: * g++.dg/parse/crash77.C: New test. --- gcc/cp/typeck.cc | 1 + gcc/testsuite/g++.dg/parse/crash77.C | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 gcc/testsuite/g++.dg/parse/crash77.C diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc index 71d879abef1..22a6ec9a185 100644 --- a/gcc/cp/typeck.cc +++ b/gcc/cp/typeck.cc @@ -11238,6 +11238,7 @@ check_return_expr (tree retval, bool *no_warning, bool *dangling) RETURN_EXPR to avoid control reaches end of non-void function warnings in tree-cfg.cc. */ *no_warning = true; + return error_mark_node; } /* Check for a return statement with a value in a function that isn't supposed to return a value. */ diff --git a/gcc/testsuite/g++.dg/parse/crash77.C b/gcc/testsuite/g++.dg/parse/crash77.C new file mode 100644 index 00000000000..d3f0ae6a877 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/crash77.C @@ -0,0 +1,14 @@ +// PR c++/117099 +// { dg-compile } + +struct X { + ~X(); +}; + +X test(bool b) { + { + X x; + return x; + } + if (!(b)) return; // { dg-error "return-statement with no value" } +}