From patchwork Fri Jul 15 15:05:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 18 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a98:d5ce:0:b0:178:cc93:bf7d with SMTP id g14csp423357eik; Fri, 15 Jul 2022 08:06:11 -0700 (PDT) X-Google-Smtp-Source: AGRyM1taEhXN5kB2m+9MA0FGBTNnpHhHc0AO7mJ7tBPXHnruzWEOq5PuSA1CsWZOLNw013kXPxP3 X-Received: by 2002:a17:907:6e13:b0:72b:509e:bd6b with SMTP id sd19-20020a1709076e1300b0072b509ebd6bmr14115592ejc.202.1657897571271; Fri, 15 Jul 2022 08:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657897571; cv=none; d=google.com; s=arc-20160816; b=hSFejtW6GzpQIu70ceBQEDlv9yMOkb7uNEfrEmpCTbbIEsCAxZ4U2n12i2afR7ci21 kSV7xfvLaUc0F5hlm1/kfhe/4HegegNQEEWOkhZMd+/BnS7oMSwLCDg9yXy+Y8OgwX9O KzdDWllfNyrO+huIR0isVD/u21gJCeuG2lXLfdyq+R64jHTi3zrkyfLd1j+cr2w8Fhna A+s9Tldxb3svRiYBiBCgH+yTt8CFoR7fFZ2cdMLVBPT1V7h0FfGNaSPxEqDILETkfMLo Kt0V8+iVrI74bEjT5MNbHtn2s+dME1rRc7L3h42MarPvnSJfyvrO2p0QjANxqz/q7oSq J6+Q== 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:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=In3x+Jgu89WsQKrdMUEzSlBVKkTjGn9e77o+ezrSvwU=; b=GbGJe6EY7/m1eLaMZRYRW8T4ETjAVfxn13vzBTvhM7In02QQZoaE1dnozLlAELsFrf IBQsBMgHTCr2/XJ8ZoVNpKQZGLHMUiCDFJPBGCYjsnDxhtwe4/pYP7lM+7k1mzWzSOfM DRVLKQdulRviL2uytVo0Fx39873A5a3gWklfbjfj++QXo+Cx5nkRUvRz44kUDlhpgTlq 5UCCHRuA+AsfeJgVNeGH2+x9u4+U28IIo1gPDNfSjq+FsP66/f2+VpaeTMXOLRPnpFz8 nvuVyhLnvr15WDrTA5Aw9140RG175R+l0r3kpQd4CM0za8Y+VH/M4/SwIqxvoXnXP5YG WCnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=MHjolI4d; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id kl10-20020a170907994a00b0072aeaa77021si6142139ejc.179.2022.07.15.08.06.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 08:06:11 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=MHjolI4d; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 14DB73857358 for ; Fri, 15 Jul 2022 15:06:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 14DB73857358 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657897570; bh=In3x+Jgu89WsQKrdMUEzSlBVKkTjGn9e77o+ezrSvwU=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=MHjolI4d2stgh840DkGRqkXD5ilmY6sav3/HCBzXeVMb9z4r38IDZ1daSNfVKPyw5 0vrMowSQnPSJ0qgROGyBpiDA7BxX3j5yBkQMJ0Uq1bs/y44IE6cFSjHnrP5uTWnS9h iBpF5mAG1AB2hfjs5248jXVHYDRwCLurzJpZWngw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 8C61D3857BBD for ; Fri, 15 Jul 2022 15:05:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C61D3857BBD Received: by mail-pl1-x635.google.com with SMTP id c6so3443494pla.6 for ; Fri, 15 Jul 2022 08:05:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=In3x+Jgu89WsQKrdMUEzSlBVKkTjGn9e77o+ezrSvwU=; b=Nf5m0tzis85cHlGR9z7EHCy+DiR2vJ7gX3JDJka8Khu/c8gsedHTWXY8VJY8NwcUrS +SuyPjXuT4FT1i10Qjo674ydJNcvsFQZIg1me+Lm7R0Hiq1KjK+S27xL296CBsbe/zza Dsh4o51p4CRTssZ10PxBs1+q8nHNzDGKk5UroGqo1pVqYd/Ko7cQruFrQc4vFMYDyCE0 D8qrxbsFH2/hOVTPaDH0bi6PkNWG45Gndq7Z+qutsithzLNw+hQnfkOfynCFrohjavHi FNf8ndPNqkdV6Og4zJ3rgSOYvqno3dUndSVCb4eAbt18raMMwxfBRpjw/llusLA1uVeh qnqQ== X-Gm-Message-State: AJIora+CXkpqzKCB3yfvvYwmJ5xQ++AEKdZO8MgwwuJCWW97DiQSzXd/ JNRdzzi6eJ6YcSWq//Lt1//FdYpIj0fEs6rcIuiQd4yoX1qv+w== X-Received: by 2002:a17:902:efc6:b0:16b:dd12:4d30 with SMTP id ja6-20020a170902efc600b0016bdd124d30mr13904459plb.29.1657897521454; Fri, 15 Jul 2022 08:05:21 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 15 Jul 2022 08:05:10 -0700 Message-ID: Subject: Go patch committed: Don't crash on f(g()) if g returns a zero-sized value To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, 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: , X-Patchwork-Original-From: Ian Lance Taylor via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: Ian Lance Taylor 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?1738431603302392070?= X-GMAIL-MSGID: =?utf-8?q?1738431603302392070?= This patch to the GCC interface of the Go frontend fixes a crash in f(g()) if g returns a zero-sized value. In that case the GCC interface modifies g to return void, since GCC's middle-end does not have solid support for zero-sized values. This patch detects the f(g()) case and replaces the call to g() with (g(), zero). The test case for this is https://go.dev/cl/417481. This fixes https://go.dev/issue/23868. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian * go-gcc.cc (Gcc_backend::call_expression): Handle a void argument, as for f(g()) where g returns a zero-sized type. 1eb1495f7d0fa9b49f6f3c34bbbf4dd1e850607c diff --git a/gcc/go/go-gcc.cc b/gcc/go/go-gcc.cc index f3de7a8c183..7b4b2adb058 100644 --- a/gcc/go/go-gcc.cc +++ b/gcc/go/go-gcc.cc @@ -2112,6 +2112,19 @@ Gcc_backend::call_expression(Bfunction*, // containing fcn for call args[i] = fn_args.at(i)->get_tree(); if (args[i] == error_mark_node) return this->error_expression(); + if (TREE_TYPE(args[i]) == void_type_node) + { + // This can happen for a case like f(g()) where g returns a + // zero-sized type, because in that case we've changed g to + // return void. + tree t = TYPE_ARG_TYPES(TREE_TYPE(TREE_TYPE(fn))); + for (size_t j = 0; j < i; ++j) + t = TREE_CHAIN(t); + tree arg_type = TREE_TYPE(TREE_VALUE(t)); + args[i] = fold_build2_loc(EXPR_LOCATION(args[i]), COMPOUND_EXPR, + arg_type, args[i], + build_zero_cst(arg_type)); + } } tree fndecl = fn;