From patchwork Tue Jan 30 12:07:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1892900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=GJa/sIf3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPPvq0LCHz23gc for ; Tue, 30 Jan 2024 23:42:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E45FC3838A14 for ; Tue, 30 Jan 2024 12:42:44 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id A6D003857BAA for ; Tue, 30 Jan 2024 12:11:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A6D003857BAA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A6D003857BAA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616749; cv=none; b=QcKJMxtJgADxtXBztkLXtRHQTqv62XdwcFYVk847dE4++K6ECKWWbUG97bodXkFNSgu1GzKIi6zG9X3YkpuVPio7XZoV3hUvZN8wFIi/y/bNE4Wa0IgVtWBDWGonnxMRqieqi4GQehFQLLRg47tCvGiEs2VAn2FCPuC/inEM4/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616749; c=relaxed/simple; bh=ZDDDeYum+sKZI6SaElWJGnYJoREDqsJz90r8YyjZdMQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=w5M1B46lHpMVRY4BLcAdWbLQfkhZ02JwY44Pp/EfcD0AADJREriYL8KjGLsfcIKFvo1f5WfcY9l9UhzOpk0fle6SFHoKVRFhUW+g9gthPxu/JL06ASERC34TVfYevfNg2zigJQqVNRdI14nRfna8w2jm8vf0nOuU3bnzGCRV7FA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40e7065b692so42213315e9.3 for ; Tue, 30 Jan 2024 04:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616707; x=1707221507; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=V1kTLZD/OXfg/UsP4JQkkO4nO5Ahvz0W1byIfbhioUU=; b=GJa/sIf3r2b84/pYWuS9L+1fHxjExK+Vb1iwXh3Nh36r1TmhLV6TMALNWmBYkJXb+l AHLILdKNQRib7k0t5MOo+Qb32F1dp6pXFzkt7EIUOFUBW0Q9xIhoW1Nn2DOIS4qpJrJT iQBBiNTvf3UAAIOsh68J01K0kssxLameT68fe6uS83xYXBZNynBdnJg7ZJcpa6C3uVbY HO7ksUeXE87BIKFW6Uv1qt11LWl/2w4LsZvBYv+9I5uGm04CWI1pEGD8f8VVGv586q6K wk0a3PEXb8WjKbmBIDub0A+CkujTZOy3DT5Hbx8P2W8gVb3OC0NUYlAus0DiXvvwnxW3 2LKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616707; x=1707221507; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=V1kTLZD/OXfg/UsP4JQkkO4nO5Ahvz0W1byIfbhioUU=; b=O003BWMqnUppSRtI5J+U+5hDDy6Fy6kIpqlbdeQJgadHKKSfOkPKkYLZ3ZF8006s7w 4yhG97jDNVUEzlozlocjgKs4bHK7T89QU9YNIfQ+I26F09WGRZDEAYux0NzLZXzFacub XpvovwIkGKDAIhSF8CLxE/mdoP/5nVV60/V5O7HdW7VE8L6V4GzAZaaMSMj+sprXwJg5 4/MM7tjyHuaLPyqwU865HQ9FQjBlz77F8QI9r/vqY507A7o+5Ud14kvqQ58f3y0gd9AY SApf5Q5R0WNHQQPmvXoUaRlAEbq0Hc+CVCmiGUNlIgTAG+ibzaAQML3W/DbIzuXjXBh/ XcrQ== X-Gm-Message-State: AOJu0YzVFbaT6gVTt+PUkkmYL24Iac306NL+WUOVhctksdA88xCqf247 S08UQ/Lq1Jx0lWut7gI8v2pgekp06+d1Bgha/BUMGBtZoaQma1xhA3h74PnvPnG27G+apJINo46 fBw== X-Google-Smtp-Source: AGHT+IE8yx2ZMENsCHFuXwboc24K9OflR7QEOpMsh9yndFt03s7fyUKwfzZ0Wpr3nrFqXesb+XRpkg== X-Received: by 2002:a5d:59a6:0:b0:33a:fdb8:c600 with SMTP id p6-20020a5d59a6000000b0033afdb8c600mr540430wrr.10.1706616707093; Tue, 30 Jan 2024 04:11:47 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:46 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Jakub Dupak Subject: [COMMITTED 078/101] gccrs: BIR: Cleanup Date: Tue, 30 Jan 2024 13:07:34 +0100 Message-ID: <20240130121026.807464-81-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Jakub Dupak gcc/rust/ChangeLog: * checks/errors/borrowck/rust-bir-place.h: Cleanup. * checks/errors/borrowck/rust-borrow-checker.h: Cleanup. Signed-off-by: Jakub Dupak --- gcc/rust/checks/errors/borrowck/rust-bir-place.h | 2 +- gcc/rust/checks/errors/borrowck/rust-borrow-checker.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-place.h b/gcc/rust/checks/errors/borrowck/rust-bir-place.h index 8c2df47c11d..523c2f6ec90 100644 --- a/gcc/rust/checks/errors/borrowck/rust-bir-place.h +++ b/gcc/rust/checks/errors/borrowck/rust-bir-place.h @@ -211,7 +211,7 @@ public: auto lookup = lookup_variable (id); if (lookup != INVALID_PLACE) return lookup; - places.push_back ( + add_place ( {Place::VARIABLE, id, {}, is_type_copy (tyty), false, NO_LIFETIME, tyty}); return places.size () - 1; }; diff --git a/gcc/rust/checks/errors/borrowck/rust-borrow-checker.h b/gcc/rust/checks/errors/borrowck/rust-borrow-checker.h index 549af3560e9..e1a3f191c87 100644 --- a/gcc/rust/checks/errors/borrowck/rust-borrow-checker.h +++ b/gcc/rust/checks/errors/borrowck/rust-borrow-checker.h @@ -30,7 +30,8 @@ class BorrowChecker public: explicit BorrowChecker (bool enable_dump_bir) - : enable_dump_bir (enable_dump_bir){}; + : enable_dump_bir (enable_dump_bir) + {} /** Perform borrow-checking using polonius on an entire crate */ void go (HIR::Crate &crate);