From patchwork Tue Jan 30 12:06:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 84958 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 94FF83870C35 for ; Tue, 30 Jan 2024 12:30:59 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by sourceware.org (Postfix) with ESMTPS id 334C43857C5E for ; Tue, 30 Jan 2024 12:11:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 334C43857C5E 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 334C43857C5E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::429 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616700; cv=none; b=w/F27HB788IlmMRerK+P7Az+JrvMHnsQIbJkBOrOv38kgQXqpFkyZS6F68qQkAGuPGgw85SYDQ/7rGdsjhE5dopJGfjjOBx1jU4esjL/VT2F8BFa/RgtlDeaF3c2DNyx14BZ5z4jeEZNIxBm6EdHPYuavZf92KL9GVQmQfYIQzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616700; c=relaxed/simple; bh=6nF3GfjIhkf0+o7M+mjYp9Dg6vUPs+tWmBRRWyGmTj4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FU338R0Yjk7A9i7aKB9n207h+3qdcUBa8VQAgTaCqFhX/k/++Crs4AH3//UkRAHw6L8pDqAyFH7o3oGICkZZPryS65GbIWppoMJUWsmLIWTgrnPLFiwM7u4y4lyctB1T5SBmkoG64tEeqVHzdD/xYO8LLF/5v3wIP5vSP17KsZM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-33ae6dfa923so1618620f8f.1 for ; Tue, 30 Jan 2024 04:11:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616677; x=1707221477; 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=FPdj5EeUJg4+xnxlKqzyKOWIy2wu4ozREOJKI5LW+98=; b=CcqMcRuw0kzNLnxH64uLbixdB67mrpYNvX+Ugc5fw8+cFoNknlfvZCLObidT2oGduQ flrRL7+tyBajxKngxicZvEbAV2SDBvhLX4zmp2KVOi3HsGdEuSma4yb/b6SG5SqZEIwx ntC7jxpo0AHhly4siV9edu2MsD0BqhoYDhPZaiPCaU8hn9S3WQzdxwTy5yhp98jGRK+Z mdoLFr1jMRUOiRIbqWkohDCx1/Ay+3pH3hJJcfEpx8wlRQyWPZwGj0RGKGnuFURkBLEJ mAFKhiqlMshc7zocu5PFiO5cbTwVAE9CabnjFFM3AfQTP1CHV2mIW+1IX+FSfpCeA1OU lbow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616677; x=1707221477; 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=FPdj5EeUJg4+xnxlKqzyKOWIy2wu4ozREOJKI5LW+98=; b=VUx+kV+LeM6spW3CJytt+FYPYyNPKTsk7e0SQFcjO262aTVROwLK1OwF7guHnZ4HlV GqdtbEULwhRXbwo1r/zfQV8fJdjFMjO84vs/EHrwrhP84m3Gmx6AEclWp9e3E6JivVt+ e6QIg/TzfpTsJrRD7mU1Hr5KDWX4hShKYxKC9unVntXMGX66jOP7y1velrDYcLKAXKmP LdcharQHDgoGMKxcUwaALFfNw7ef/wn93cIdMEOEiuvmfl8T1iCCzWTaDu/VIpKyarq7 lp/qAfAEPFvJwvDSvG5l34iL+C7x/mIgSTfcILSrqdrOaZr5fn0GCH9NfjiVFxWrn7UI Ydlw== X-Gm-Message-State: AOJu0YwyugIsODldIJT8jlUI0FEJcJjPOjZnW8/xgBc5k3Iu2WjA8ugJ shscyC1niY8WWGbe33HsWuM1VyX+SPU9/0hNBYqmHXr+ux4MCNAAnb9Yhpu0cOO4YBgDrx5To+c ZiQ== X-Google-Smtp-Source: AGHT+IEGtGyhoGhnGvnV7Ib7sb2eLwADi85D3HXh5uGaCiUDIJiXxsN0RNU42gVkfrWCxgRYK1r+Uw== X-Received: by 2002:adf:f84a:0:b0:33a:de27:b138 with SMTP id d10-20020adff84a000000b0033ade27b138mr6348725wrq.47.1706616677646; Tue, 30 Jan 2024 04:11:17 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:17 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 038/101] gccrs: late: Start storing mappings properly in the resolver Date: Tue, 30 Jan 2024 13:06:54 +0100 Message-ID: <20240130121026.807464-41-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.1 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=unavailable 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+patchwork=sourceware.org@gcc.gnu.org From: Arthur Cohen gcc/rust/ChangeLog: * resolve/rust-late-name-resolver-2.0.cc (Late::visit): Store mappings after having resolved them. * resolve/rust-late-name-resolver-2.0.h: Add `TypePath` visitor. --- .../resolve/rust-late-name-resolver-2.0.cc | 33 ++++++++++++++++--- .../resolve/rust-late-name-resolver-2.0.h | 1 + 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc index 3236886f37d..5f70f575582 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -20,6 +20,7 @@ #include "rust-ast-full.h" #include "rust-late-name-resolver-2.0.h" #include "rust-default-resolver.h" +#include "rust-path.h" #include "rust-tyty.h" #include "rust-hir-type-check.h" @@ -121,11 +122,24 @@ Late::visit (AST::IdentifierExpr &expr) { // TODO: same thing as visit(PathInExpression) here? + tl::optional resolved = tl::nullopt; auto label = ctx.labels.get (expr.get_ident ()); auto value = ctx.values.get (expr.get_ident ()); - rust_debug ("[ARTHUR] label: %d", label ? *label : -1); - rust_debug ("[ARTHUR] value: %d", value ? *value : -1); + if (label) + resolved = label; + else if (value) + resolved = value; + // TODO: else emit error? + + ctx.map_usage (expr.get_node_id (), *resolved); + + // in the old resolver, resolutions are kept in the resolver, not the mappings + // :/ how do we deal with that? + // ctx.mappings.insert_resolved_name(expr, resolved); + + // For empty types, do we perform a lookup in ctx.types or should the + // toplevel instead insert a name in ctx.values? (like it currently does) } void @@ -136,11 +150,20 @@ Late::visit (AST::PathInExpression &expr) // do we emit it in `get`? auto label = ctx.labels.resolve_path (expr.get_segments ()); - auto value = ctx.values.resolve_path (expr.get_segments ()); +} + +void +Late::visit (AST::TypePath &type) +{ + // should we add type path resolution in `ForeverStack` directly? Since it's + // quite more complicated. + // maybe we can overload `resolve_path` to only do + // typepath-like path resolution? that sounds good + + auto resolved = ctx.types.get (type.get_segments ().back ()->as_string ()); - rust_debug ("[ARTHUR] label: %d", label ? *label : -1); - rust_debug ("[ARTHUR] value: %d", value ? *value : -1); + ctx.map_usage (type.get_node_id (), *resolved); } } // namespace Resolver2_0 diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.h b/gcc/rust/resolve/rust-late-name-resolver-2.0.h index f54bbf2eea4..15940d053ae 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h @@ -45,6 +45,7 @@ public: // resolutions void visit (AST::IdentifierExpr &) override; void visit (AST::PathInExpression &) override; + void visit (AST::TypePath &) override; private: /* Setup Rust's builtin types (u8, i32, !...) in the resolver */