From patchwork Fri Jul 1 20:38:37 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: 1651388 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=ZmZeQ5rM; 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 (ip-8-43-85-97.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 4LZRrM2SKNz9s07 for ; Sat, 2 Jul 2022 06:39:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9CD1E385AC3C for ; Fri, 1 Jul 2022 20:39:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9CD1E385AC3C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656707951; bh=l8TCnpsbgQSWoJcjpEj9jouTR4Wqp4KqET74EZ2eZQg=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ZmZeQ5rMSDytTaJXNtKXh5lfhlrFpGI/n9oy4DBWQcm9BJ82WlXyDeSKgdHnGSCoB Kj7ut5z93AAHR3HWFCdD50YSgNZIyRVipCSSSCQFU7Y6hg0W52ofXGi6Dk7UPPg2gW fVyyBL5FFKHYgb1CuQLxR++WW6YQeeUNFvF4No/8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by sourceware.org (Postfix) with ESMTPS id D9AD63858C54 for ; Fri, 1 Jul 2022 20:38:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D9AD63858C54 Received: by mail-pf1-x42f.google.com with SMTP id n12so3523195pfq.0 for ; Fri, 01 Jul 2022 13:38:50 -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=l8TCnpsbgQSWoJcjpEj9jouTR4Wqp4KqET74EZ2eZQg=; b=3/GE8MBYVMk5nf/z2SiRMOde4wSs+0Z5TWZCDY0hLaICWLGBmOKzgQrrrcrssFl4t3 ZJuZjSpq7W3ZL6FMALNFJGGKkR+l5A+cN+ymwHY+JnSjU5w1Pcd/TNi2DOFpb+jCpGNu A4M2Aioh+4Q0lvFK+6+CHZ6MFqaZOJvWKkkbvMwU6P9ddL4/h2H6ekDa537VrBuZmhEs VNfjdCA6y4JbPSCnGU+N0Oe1lmk4S7eklnx+iQgRWtAJi4AkZsZEc7XuW0CZjbZHE0Hw xQV0OLNsWd2UMdMZ6X69Bomw6SadPbzuDSYFQCStSXpYzAHOrlyfqR7D+I5pzcCqIfb9 a9TA== X-Gm-Message-State: AJIora9l1TV02K1fB9onyxNfiCAQNfKS6Uf+E6QgbRnfZfO5YB+kTWY2 PkUS3DbSUb+sIsy1S4Qk2rCzbYQgw6+CMKVEmE8KDjETwGy3Eg== X-Google-Smtp-Source: AGRyM1uev5Qpr+JcEoQXlIFXYU8EugDCzJy8OL0+qDRnBdDtp5yFG/k9qTd+jEZ/B+Ygy+ZRcOCGi79CeuiM+tTPRUI= X-Received: by 2002:a63:8749:0:b0:411:6cb6:e92c with SMTP id i70-20020a638749000000b004116cb6e92cmr13677690pge.20.1656707929130; Fri, 01 Jul 2022 13:38:49 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 1 Jul 2022 13:38:37 -0700 Message-ID: Subject: Go patch committed: Avoid C++20 keyword requires To: gcc-patches , gofrontend-dev X-Spam-Status: No, score=-9.9 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.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 renames "requires" to "needs" to avoid the C++20 keyword. Bootstrapped on x86_64-pc-linux-gnu. Committed to mainline. Ian 9d44418664ec8c3e59365901e3ec02e488d9e01c diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 0d49e9e70c6..65f64e0fbfb 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -548720bca6bff21ebc9aba22249d9ce45bbd90c7 +ac438edc5335f69c95df9342f43712ad2f61ad66 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/gogo.cc b/gcc/go/gofrontend/gogo.cc index e13df0da22b..67b91fab4ca 100644 --- a/gcc/go/gofrontend/gogo.cc +++ b/gcc/go/gofrontend/gogo.cc @@ -5302,16 +5302,16 @@ Gogo::write_c_header() Named_object* no = types.front(); types.pop_front(); - std::vector requires; + std::vector needs; std::vector declare; - if (!no->type_value()->struct_type()->can_write_to_c_header(&requires, + if (!no->type_value()->struct_type()->can_write_to_c_header(&needs, &declare)) continue; bool ok = true; for (std::vector::const_iterator pr - = requires.begin(); - pr != requires.end() && ok; + = needs.begin(); + pr != needs.end() && ok; ++pr) { for (std::list::const_iterator pt = types.begin(); @@ -5342,10 +5342,10 @@ Gogo::write_c_header() if (*pd == no) continue; - std::vector drequires; + std::vector dneeds; std::vector ddeclare; if (!(*pd)->type_value()->struct_type()-> - can_write_to_c_header(&drequires, &ddeclare)) + can_write_to_c_header(&dneeds, &ddeclare)) continue; bool done = false; diff --git a/gcc/go/gofrontend/types.cc b/gcc/go/gofrontend/types.cc index e82be6840aa..4995283bb60 100644 --- a/gcc/go/gofrontend/types.cc +++ b/gcc/go/gofrontend/types.cc @@ -6967,7 +6967,7 @@ Struct_type::do_import(Import* imp) bool Struct_type::can_write_to_c_header( - std::vector* requires, + std::vector* needs, std::vector* declare) const { const Struct_field_list* fields = this->fields_; @@ -6978,7 +6978,7 @@ Struct_type::can_write_to_c_header( p != fields->end(); ++p) { - if (!this->can_write_type_to_c_header(p->type(), requires, declare)) + if (!this->can_write_type_to_c_header(p->type(), needs, declare)) return false; if (Gogo::message_name(p->field_name()) == "_") sinks++; @@ -6993,7 +6993,7 @@ Struct_type::can_write_to_c_header( bool Struct_type::can_write_type_to_c_header( const Type* t, - std::vector* requires, + std::vector* needs, std::vector* declare) const { t = t->forwarded(); @@ -7027,13 +7027,13 @@ Struct_type::can_write_type_to_c_header( return true; case TYPE_STRUCT: - return t->struct_type()->can_write_to_c_header(requires, declare); + return t->struct_type()->can_write_to_c_header(needs, declare); case TYPE_ARRAY: if (t->is_slice_type()) return true; return this->can_write_type_to_c_header(t->array_type()->element_type(), - requires, declare); + needs, declare); case TYPE_NAMED: { @@ -7049,10 +7049,10 @@ Struct_type::can_write_type_to_c_header( // We will accept empty struct fields, but not print them. if (t->struct_type()->total_field_count() == 0) return true; - requires->push_back(no); - return t->struct_type()->can_write_to_c_header(requires, declare); + needs->push_back(no); + return t->struct_type()->can_write_to_c_header(needs, declare); } - return this->can_write_type_to_c_header(t->base(), requires, declare); + return this->can_write_type_to_c_header(t->base(), needs, declare); } case TYPE_CALL_MULTIPLE_RESULT: @@ -7150,9 +7150,9 @@ Struct_type::write_field_to_c_header(std::ostream& os, const std::string& name, case TYPE_POINTER: { - std::vector requires; + std::vector needs; std::vector declare; - if (!this->can_write_type_to_c_header(t->points_to(), &requires, + if (!this->can_write_type_to_c_header(t->points_to(), &needs, &declare)) os << "void*"; else