From patchwork Thu Aug 1 14:57:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 95051 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 9D95C384B814 for ; Thu, 1 Aug 2024 15:32:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by sourceware.org (Postfix) with ESMTPS id 7A08C386180D for ; Thu, 1 Aug 2024 15:00:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7A08C386180D 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 7A08C386180D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::534 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524459; cv=none; b=fYTUsczyO9Ardd8IPFouNJ1ge0AtcX/2h7sMTyr7kutinUtcOkk/t4GtfOhFwmMLp3Szn7b+/cjHe7INTC04zKpIp03mwhYiHe0WE4VUFnawcJiYyNXNfKxmOuflguhMaLYDUXee0uOngLt85YoJNivQMOzurlQbSA4voD5/3lY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524459; c=relaxed/simple; bh=GiIn/jyevRXq5+kwiPxXZPOWK7y8LDdaU9dpQryrUaE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=boWjamC+EJgmoleaYh+s7z8LVRjc8l+YkQPZq1eKthJJ3UK6iUYob3QkFw4SbF4QcLjnXvcXZdf+lyamXCiPkamhVWOEtGFkQaKOh6iOWlpJ9NWcTZB68IgL8+CSSJK0GJQNXHxpTB8yGyBF/yVooOhTyJrH3AbN04bfPxfVLHQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-5ab2baf13d9so9937513a12.2 for ; Thu, 01 Aug 2024 08:00:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1722524409; x=1723129209; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=K/X51NX9vSj1f0rDU0QnwuDkWOo9SGnH1e0F7xJaCQc=; b=JZHxLpVYkloKvDLP0rDpPg0mIVXBMU85y/nVM0XIl3eYf/oHBdRATp4vTQRfP6vTLb QqddHFmRUe5DGlSAj3H0XZlaDkXyrDmUPAZ23CJ1bXUxqhpOic+I+VTPKfok4en2n+dD ypQC/W+D3K4Rk6X7VuBvH8HIu32mZrN8QFOZnwvNIwdmnrGhSvkhtBAJIRzy457AwC+W qTESf/qbhO+SWyTYV9M/aNF1muzI78YI0DRPvY5gr2g5ipKRu7Dq2eGPnnaEHVKGmTFJ QjRnOt+MNNTkcbpoeJAYmBjpF5zq/jjAhbws+LgP2PM/Qb8FzynD3bo7SsAS4YspDspV Xpsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722524409; x=1723129209; h=content-transfer-encoding:mime-version: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=K/X51NX9vSj1f0rDU0QnwuDkWOo9SGnH1e0F7xJaCQc=; b=ECmESgj4R2E8NpWLgUHZdSbtm2l6wfGZciv5UaCK0JlLWtPWUOGCuFRwkNd5O7xPWc pXEJ/QzdPPr9I4Xp+OZbV/lLtoH5/JHY8vI8kCJtNXlrN/uycuNYnVXKth3aaatJMZhP 1Ol7a9AfaCTs0zw8lm6cgS9aebFlDwczdAMmNpCkVVYzgqBs07SKRA7q4RvQam70eACF 6O0H/3bxxpyQU/u3vVw5Od14+LDfqHuSHegd7OQ/QV2+TXTkyRlX70vG/Q3riTaFFNFm zOxGYInXebid9wAHUfFSQaqtJlVCVOv79/ctiGKaHz2fcSNG++TlVUYfhxdg9I9G5U64 Wgig== X-Gm-Message-State: AOJu0Yy/SOlQPgVZYAWs5x3G9B+ObJeqtBKCv5HEOMMdlO06sk8IuI00 6QbAxTUvTWiJqWzNzJ8TbQF3JvdOi9qc7RGx1AnwypW1j0FrN+aGmNOnpTVkW5AKm4RwXkzp8eR bJiJm X-Google-Smtp-Source: AGHT+IF+f6Z09viw+inYAcjQEhyr/Y+3ZRQeVGYT7xyahQhpupKm4KRe24HdCWIa7Ewi3O1qdMLNbw== X-Received: by 2002:a05:6402:2d5:b0:5a3:d140:1a52 with SMTP id 4fb4d7f45d1cf-5b7f35fdab7mr434520a12.3.1722524408773; Thu, 01 Aug 2024 08:00:08 -0700 (PDT) Received: from platypus.lan ([2a04:cec2:9:dc84:3622:6733:ff49:ee91]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63590592sm10252456a12.25.2024.08.01.08.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 08:00:08 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [PATCH 093/125] gccrs: Reinject Self parameter in new resolver Date: Thu, 1 Aug 2024 16:57:29 +0200 Message-ID: <20240801145809.366388-95-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801145809.366388-2-arthur.cohen@embecosm.com> References: <20240801145809.366388-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 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: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org From: Pierre-Emmanuel Patry The old resolver injected a Self generic parameter in order to help the trait solver. This is clearly sketchy at best and should be fixed in the future. gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Add Self generic parameter injection and a warning. * resolve/rust-toplevel-name-resolver-2.0.h: Add function prototype. Signed-off-by: Pierre-Emmanuel Patry --- .../rust-toplevel-name-resolver-2.0.cc | 23 +++++++++++++++++++ .../resolve/rust-toplevel-name-resolver-2.0.h | 1 + 2 files changed, 24 insertions(+) diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc index f65ec77331c..80b142678b9 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -186,6 +186,29 @@ TopLevel::visit (AST::Module &module) Analysis::Mappings::get ()->insert_ast_module (&module); } +void +TopLevel::visit (AST::Trait &trait) +{ + // FIXME: This Self injection is dodgy. It even lead to issues with metadata + // export in the past (#2349). We cannot tell appart injected parameters from + // regular ones. Dumping generic parameters highlights this Self in metadata, + // during debug or proc macro collection. This is clearly a hack. + // + // For now I'll keep it here in the new name resolver even if it should + // probably not be there. We need to find another way to solve this. + // Maybe an additional attribute to Trait ? + // + // From old resolver: + //// we need to inject an implicit self TypeParam here + //// FIXME: which location should be used for Rust::Identifier `Self`? + AST::TypeParam *implicit_self + = new AST::TypeParam ({"Self"}, trait.get_locus ()); + trait.insert_implict_self ( + std::unique_ptr (implicit_self)); + + DefaultResolver::visit (trait); +} + template static void insert_macros (std::vector ¯os, NameResolutionContext &ctx) diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h index f5e224fa049..e226c79dfbc 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h @@ -88,6 +88,7 @@ private: std::unordered_map node_forwarding; void visit (AST::Module &module) override; + void visit (AST::Trait &trait) override; void visit (AST::MacroRulesDefinition ¯o) override; void visit (AST::Function &function) override; void visit (AST::BlockExpr &expr) override;