From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2116) id 07DFB3857BBD; Fri, 15 Jul 2022 15:05:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 07DFB3857BBD MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Ian Lance Taylor To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1711] go: fix f(g()) where g returns zero-sized type X-Act-Checkin: gcc X-Git-Author: Ian Lance Taylor X-Git-Refname: refs/heads/master X-Git-Oldrev: 91259dd850bcbf4c0b5bdcd8304d67b883b73cc0 X-Git-Newrev: 5054bc001d9b66fe68d938790f08f48621c6b976 Message-Id: <20220715150507.07DFB3857BBD@sourceware.org> Date: Fri, 15 Jul 2022 15:05:07 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2022 15:05:07 -0000 https://gcc.gnu.org/g:5054bc001d9b66fe68d938790f08f48621c6b976 commit r13-1711-g5054bc001d9b66fe68d938790f08f48621c6b976 Author: Ian Lance Taylor Date: Fri Jul 15 08:02:13 2022 -0700 go: fix f(g()) where g returns zero-sized type Test case is https://go.dev/cl/417481. Fixes golang/go#23868 * go-gcc.cc (Gcc_backend::call_expression): Handle a void argument, as for f(g()) where g returns a zero-sized type. Diff: --- gcc/go/go-gcc.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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;