From patchwork Wed Feb 9 22:14:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 1590738 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=hS+lTQ+Y; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JvDjG55yjz9s8s for ; Thu, 10 Feb 2022 09:15:46 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 23DF63858439 for ; Wed, 9 Feb 2022 22:15:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23DF63858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1644444944; bh=PjhSzNqfLl4bd8ST+BSUCggeqYeBv0xAoeK1tJ7Vea8=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hS+lTQ+YrMNy5XbHveGq1FTOj5Irtaf+Bra/bCgBHxfuNKDhOgRSNDomMyXzwz4D0 lJDT+EGxdMqMnPP6HOSq3ZBBqth1kPzcm5F+5lB7j5wrkgYpB4q4G5D/mvoLpLHr3/ pQ1Pba4ESw3Ew6hx+vlz49/UqW0vp4Di3OVt85KU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id D9DE33858433 for ; Wed, 9 Feb 2022 22:14:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9DE33858433 Received: by mail-ed1-x532.google.com with SMTP id cf2so7756396edb.9 for ; Wed, 09 Feb 2022 14:14:21 -0800 (PST) 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=PjhSzNqfLl4bd8ST+BSUCggeqYeBv0xAoeK1tJ7Vea8=; b=2AR36CFzwYyCg7EYBCwQJj2PjjWxIxD/ajW3GVUmvQ3IXqrc1hDyiS7vgYAKjkp8GA bDpfUxOoVTvbR12yTaGr7Def21h7ib6Xt80y098q7gAJuOWa4+yX1aHnD5SzA3rjOD0m b95KxVkO9+V2RThmJIoU+41RmW7AYlf+/JSZprxidprjweepoBofKSmlNCRo1h+b2kfw lIylQwJyf3phw2VZlzndPel/IoS0c9xHS8uPoM9SLKtgvbr56/SO801nKoVpRxwah844 akGXbYUsdnH2fnXBBJqHubctM22fge6+c476vOUFH0PenNv1BHZQA94l3i4aPs3eA3GJ D7RQ== X-Gm-Message-State: AOAM530O3Ep4OmEiU+ZPjkPIBI2+MeUEWEuBpk9qv4VTG5HP8ZNNZ2iX jbXU8rUVQCaNW63/OXrXhKhNdoL8B/uXy/qL5VZSjXTHIGzEFg== X-Google-Smtp-Source: ABdhPJyhmkieSoUyVqiaQmk/nAF6X9lZiUnO50FjigrDDVmmyXiOrh8y4pxtr2ySkHYwPPZvf5Mc7xBeBnSna8ss2n0= X-Received: by 2002:a50:e701:: with SMTP id a1mr5098167edn.110.1644444860664; Wed, 09 Feb 2022 14:14:20 -0800 (PST) MIME-Version: 1.0 Date: Wed, 9 Feb 2022 14:14:09 -0800 Message-ID: Subject: Go patch committed: Use nil pointer for zero length string constant To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Ian Lance Taylor Reply-To: Ian Lance Taylor Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This patch to the Go frontend uses a nil pointer for a zero length string constant. We used to pointlessly set the pointer of a zero length string constant to point to a zero byte constant. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian 2e2b861e8941c4e9b36b88e9c562642b1aba6eaf diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3ea7aed3506..8cbd0c19a8d 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -7dffb933d33ff288675c8094d05c31b35cbf7e4d +263e8d2a2ab57c6f2b3035f370d40476bda87c9f The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/expressions.cc b/gcc/go/gofrontend/expressions.cc index d7b64767a00..3f597654858 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -2123,9 +2123,15 @@ String_expression::do_get_backend(Translate_context* context) Location loc = this->location(); std::vector init(2); - Bexpression* str_cst = - gogo->backend()->string_constant_expression(this->val_); - init[0] = gogo->backend()->address_expression(str_cst, loc); + + if (this->val_.size() == 0) + init[0] = gogo->backend()->nil_pointer_expression(); + else + { + Bexpression* str_cst = + gogo->backend()->string_constant_expression(this->val_); + init[0] = gogo->backend()->address_expression(str_cst, loc); + } Btype* int_btype = Type::lookup_integer_type("int")->get_backend(gogo); mpz_t lenval;