From patchwork Thu Aug 1 14:56:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1967782 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=I0MBmPFj; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WZXll5rdkz1ybX for ; Fri, 2 Aug 2024 01:22:59 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE75E3858430 for ; Thu, 1 Aug 2024 15:22:57 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by sourceware.org (Postfix) with ESMTPS id 1BA053860765 for ; Thu, 1 Aug 2024 14:59:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1BA053860765 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 1BA053860765 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::533 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524401; cv=none; b=v/CTTB129PK1GN2iKlCj4/leGzd5h0T+Ae9xHp2+0rDt17aN/8crYb76IiSmF0gPweoxMw0gT02FYBIsIimir8uBv4YfqHQknYQqI8GWgaTfKN1K/7n7qJSHJs3V4dm23BlEfZgOHM/FTUmAfEJo4A6wfyx6kujcRiNJtK+Bqzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524401; c=relaxed/simple; bh=VsCgYG8of5CCzbwaA5C0Qqqc4Nvt6SYE0nVhMmbtnvA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=IP7RXnrZuq3/9XslhsE9/uDY1FYZzDQHraW7BmYdyREquPXvAC54nC7UZ1Q+MqIaeSJJacvLBbr/BWfQmjBVCkpXlnHw0iGZ4fo5UevFykhMBCCsbsdJ/JYGqsdFx59h9cpKktnlaMoNwsmBaqSgJgIY8MBZ8OaBUiP6RMCIBKQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5a10835487fso10070371a12.1 for ; Thu, 01 Aug 2024 07:59:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1722524369; x=1723129169; 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=TDULtpLAcRO6MUe/jzsm930TbVu/yoDhYrmgPCXViFI=; b=I0MBmPFjrQgblYPD6YEmR2hLfcOKIoCEjZVFjKhlFTC3Y7RoMqHRwuXxdbknK9jAGd G/c957SNCCaEfno3UqeU4NqzpnStKPK1HGmCByMpo1R2uF+xC6WQxn23MxtC5na4Rsus PPnyuvtuF87dIwTs8s7bfqrXXvf4K4YklN+CIqGmAsId3UGoevJvJ7C/73paa6GWy9ve NOW00URyBScXWMzqma/Mh1s1Z7FS6+Z9XVhjrG/ojqLXaug8sSM7+snpTLVkld0oNwSM xjVDQRhwvTW1MVH7NYNst6dpwwvViVQZ4b4l12/ngQ5Av5RDNnGsWmomEcgY/w4mmmJV 5GPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722524369; x=1723129169; 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=TDULtpLAcRO6MUe/jzsm930TbVu/yoDhYrmgPCXViFI=; b=NcMfsDqlbMkCURpQPR/WUUGOKxRvUQvJ1DHpOThBm73AxH3Mye41TEEKtFFJi7A4Qu 3sNNqMSettAwsIHCVh+8Fk9/NNUFkUxy0pSP18S8U/UGMEkxspdMMTkEPnX+6Mk6Dnvd uAngMqj3kOMZRPGSeybVWGEpXF9Bwkh36PGzneW0PxPCtB7D8FyV/nSjq2bP/Dqci+ZI uowSMcuGhveDxTezEBnZEtM14aqHuQ56hJkB3JHPDLzrte01N1zKuWSAY+QsKRMXdLs3 sqCgelHTs231dH8wBVPwLEQBcIWXmUKx/ZOWohzruCAxqhjW1XlEF2XU5KFpxKt/PuHD psAA== X-Gm-Message-State: AOJu0YwelC/mepAGfAPq7gdAfFV4gjQz88TJuf2bc1SMlNq97S0HUkth TUol8ebPvGNe4s+GoSiKH8c0DDnyJefnRj2hOQx+0QtxUAhTHrLIb2h/xZCxW0wphtva3K6fZ04 fqAf/ X-Google-Smtp-Source: AGHT+IE27JV5BcRNOvMgCsxdcwV84GKWD6llDTZF5zIpas36+3eP1vwV4/UlkX+NEGl2oWHrKWq4Cw== X-Received: by 2002:a50:fc0c:0:b0:5a4:12ea:333f with SMTP id 4fb4d7f45d1cf-5b7f5dc279amr326890a12.37.1722524369052; Thu, 01 Aug 2024 07:59:29 -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.07.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 07:59:28 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [PATCH 061/125] gccrs: session-manager: Dump name resolution pass. Date: Thu, 1 Aug 2024 16:56:57 +0200 Message-ID: <20240801145809.366388-63-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.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 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~incoming=patchwork.ozlabs.org@gcc.gnu.org gcc/rust/ChangeLog: * rust-session-manager.cc: Add files for dumping name resolution, call name resolution dump function. (Session::dump_name_resolution): New. * rust-session-manager.h: New declaration. --- gcc/rust/rust-session-manager.cc | 30 +++++++++++++++++++++++++++--- gcc/rust/rust-session-manager.h | 1 + 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index 40adeb20de4..64e0190f716 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -69,6 +69,10 @@ const char *kASTDumpFile = "gccrs.ast.dump"; const char *kASTPrettyDumpFile = "gccrs.ast-pretty.dump"; const char *kASTPrettyDumpFileExpanded = "gccrs.ast-pretty-expanded.dump"; const char *kASTExpandedDumpFile = "gccrs.ast-expanded.dump"; +const char *kASTmacroResolutionDumpFile = "gccrs.ast-macro-resolution.dump"; +const char *kASTlabelResolutionDumpFile = "gccrs.ast-label-resolution.dump"; +const char *kASTtypeResolutionDumpFile = "gccrs.ast-type-resolution.dump"; +const char *kASTvalueResolutionDumpFile = "gccrs.ast-value-resolution.dump"; const char *kHIRDumpFile = "gccrs.hir.dump"; const char *kHIRPrettyDumpFile = "gccrs.hir-pretty.dump"; const char *kHIRTypeResolutionDumpFile = "gccrs.type-resolution.dump"; @@ -86,6 +90,7 @@ Session::get_instance () static std::string infer_crate_name (const std::string &filename) + { if (filename == "-") return kDefaultCrateName; @@ -626,9 +631,7 @@ Session::compile_crate (const char *filename) Resolver::NameResolution::Resolve (parsed_crate); if (options.dump_option_enabled (CompileOptions::RESOLUTION_DUMP)) - { - // TODO: what do I dump here? resolved names? AST with resolved names? - } + dump_name_resolution (name_resolution_ctx); if (saw_errors ()) return; @@ -982,6 +985,27 @@ Session::dump_ast_pretty (AST::Crate &crate, bool expanded) const out.close (); } +void +Session::dump_name_resolution (Resolver2_0::NameResolutionContext &ctx) const +{ + // YES this is ugly but NO GCC 4.8 does not allow us to make it fancier :( + std::string types_content = ctx.types.as_debug_string (); + std::ofstream types_stream{kASTtypeResolutionDumpFile}; + types_stream << types_content; + + std::string macros_content = ctx.macros.as_debug_string (); + std::ofstream macros_stream{kASTmacroResolutionDumpFile}; + macros_stream << macros_content; + + std::string labels_content = ctx.labels.as_debug_string (); + std::ofstream labels_stream{kASTlabelResolutionDumpFile}; + labels_stream << labels_content; + + std::string values_content = ctx.values.as_debug_string (); + std::ofstream values_stream{kASTvalueResolutionDumpFile}; + values_stream << values_content; +} + void Session::dump_hir (HIR::Crate &crate) const { diff --git a/gcc/rust/rust-session-manager.h b/gcc/rust/rust-session-manager.h index 9a5691f45ee..845b53ab6db 100644 --- a/gcc/rust/rust-session-manager.h +++ b/gcc/rust/rust-session-manager.h @@ -396,6 +396,7 @@ private: void dump_lex (Parser &parser) const; void dump_ast_pretty (AST::Crate &crate, bool expanded = false) const; + void dump_name_resolution (Resolver2_0::NameResolutionContext &ctx) const; void dump_hir (HIR::Crate &crate) const; void dump_hir_pretty (HIR::Crate &crate) const;