From patchwork Wed Jul 6 00:11:47 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: 1652745 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=a0vEy4lS; 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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Ld0NS05rjz9sGH for ; Wed, 6 Jul 2022 10:12:23 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5FD66385BAED for ; Wed, 6 Jul 2022 00:12:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FD66385BAED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1657066341; bh=wtbFKEoB2qMXhdaGCpxWgmkgcvf2cULHAJ2shh9422g=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=a0vEy4lS4tBfmU+Zle99ktz//1y11VPiCqCYJtV9U121a+zb5V2/HcTgWVJ37U/6J f0NkJxyyA8GkFg+oiScj6vzZueXSDr/gbM/FBRk4Z+QIGjqD84/NP9epaTpZL0NaNI QnhCC80Zrym/eJEU0N33QUMc8qRL2ErW3ZbI48lc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by sourceware.org (Postfix) with ESMTPS id 170313858024 for ; Wed, 6 Jul 2022 00:12:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 170313858024 Received: by mail-pg1-x535.google.com with SMTP id j184so2083827pge.10 for ; Tue, 05 Jul 2022 17:12:00 -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=wtbFKEoB2qMXhdaGCpxWgmkgcvf2cULHAJ2shh9422g=; b=rJAIBLoFT6zWLc0pImv5Cbqq9NTp52lD3RYMX/xg9M8auvPsoq+DOp3Wj/N5c60Zl/ uJsQBkWcJ7GOdrMa9tsy504zQ8iM2Y5A2J8Mfnns/gBzNuaL28qhTS24BCre/EBvezvz 8CWZpzuXuu5fQOh1Q0q5lgYMlXfYf07rPnN07moy4O3nMCwTjvJdfA9ML1vlEKwo61qT jL7vm2cqw3Gd8AqpTCTPp3UaqRPQZVBbAnRrj4Ghsx4fDi84WUf8jYJg9VCP56xPUhbV h5dmht2BSUpmbq6R2B5An6qX/lInKU1h0B/yjFEQca/r7icGY8MriqxZ4mshGrzis0s6 stJQ== X-Gm-Message-State: AJIora8HfEs5PdmT+mfDBV3rf2pEpcLTgNW1DbBDT248Wf6RtEMQAMo9 AfjYOZ8M9T+kgnMPJIwvQRPBQ9lwJG4nXcC6XNhk2bTcoHYdbg== X-Google-Smtp-Source: AGRyM1vRG3jIHYs25UycNwUqg/Ct0eepqSYYBrZ5C1VuN+yiE5BuTIdFfnQI1yBP/olO5lNcuVvDqvh94EkVZnYJGE0= X-Received: by 2002:a63:d554:0:b0:40d:86ec:626b with SMTP id v20-20020a63d554000000b0040d86ec626bmr31481872pgi.530.1657066318900; Tue, 05 Jul 2022 17:11:58 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 5 Jul 2022 17:11:47 -0700 Message-ID: Subject: Go patch committed: Propagate array length error marker To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-10.0 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, 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: 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 propagates the array length error marker farther, to avoid a compiler crash on invalid code. This fixes https://go.dev/issue/53639. Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu. Committed to mainline. Ian c70a48a8f8f6a43b35f783b5672c9a3c0a363c31 diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 461e2fdf271..7c5c45672d7 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -a209dca9ec918535977dcab99fd9bb60986ffacd +d295a0a2c96c0f7c3abd94fea3aa4e2303bf2af2 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 00d35a965a9..2492d9fe735 100644 --- a/gcc/go/gofrontend/expressions.cc +++ b/gcc/go/gofrontend/expressions.cc @@ -8486,6 +8486,11 @@ Builtin_call_expression::do_flatten(Gogo* gogo, Named_object* function, pa != this->args()->end(); ++pa) { + if ((*pa)->is_error_expression()) + { + go_assert(saw_errors()); + return Expression::make_error(loc); + } if ((*pa)->is_nil_expression()) { Expression* nil = Expression::make_nil(loc); @@ -13391,6 +13396,7 @@ Array_index_expression::do_check_types(Gogo*) if (array_type == NULL) { go_assert(this->array_->type()->is_error()); + this->set_is_error(); return; } diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index 4995283bb60..9f34801f695 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -7429,7 +7429,10 @@ bool Array_type::do_verify() { if (this->element_type()->is_error_type()) - return false; + { + this->set_is_error(); + return false; + } if (!this->verify_length()) { this->length_ = Expression::make_error(this->length_->location());