From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 645B03858D28 for ; Tue, 31 Jan 2023 13:19:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 645B03858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x334.google.com with SMTP id iv8-20020a05600c548800b003db04a0a46bso895106wmb.0 for ; Tue, 31 Jan 2023 05:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FPxAp0DEXvGJOgsW1SYRuTDqZP1r++G9wyuQK6PrpqE=; b=SAm2eQ2Fl9KykpIXwU/1ZKqzRGXiQJrEh/h+cObLkA32tkFzJAo77KTb1ZIOpOmt+z ZH+3ZN4QO2nU0nyZA8P6/5f7IpTk8OpzIvOhuBB2H7D/wRA+jfyh/Z65tpSMAERXrxi/ HrlBvGbFEj4PLc1pkygJDIXOXO7OHPf/sDsab+gq9hf9Fs3edN3RYZAJLYWL4pzaG/Oy OPAD0Ff4tG73P+xM4X5+eAANB5dXgHpRpnmkpJrHPCUjOv2tulZH7ptwYEra6cv2Jetn SJ7bzTmv9NmP9tgOMG21Er6Fkf2UMC8mLfC6wAWuikWgdvIPprXBtDz6/2ibeZZjpiYX CxaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FPxAp0DEXvGJOgsW1SYRuTDqZP1r++G9wyuQK6PrpqE=; b=XGrBZMHLxgVPpo6rwb8fJlYAMqKbmsBNPZHxT8zAzd99BER5wuUQbHhb4hu1KYvioH 7DZGbXFewzaZiEc6xCdL4lI+YUdhlo6gVb84JmsRxgMR/gyUqTlyTvd0Smre9GJhZ2xo aE1DlP44pzS7Hls18WP/+bePWVB5xhNvtS7aO8kAH+wKGrgh78VPkP5qm19A2w0Gxkpe sKOkPq5tkKzmMveE1/cy7xcx1sTQrNXeqwvr5gq6AMDa5NmcLbXMGie7KmJOEhLwaFMS wTRK1KX6myL/PtM40CbGGSjjdo5wBqs0tVnZ0xwaVVtO/gjT/g43PdctcMJZqKTM04Ef Ilqg== X-Gm-Message-State: AO0yUKUdVqP0RH5ZBYNAdlBgyTDig9xTyxCXJXl5EKfW/IUdaCbonPDx iJjKGEMCL1Q+rJ6X79ioRd8lv5fb2piTJ9c4Wg== X-Google-Smtp-Source: AK7set/TZNFimDMpsPkiktd/BRAQJx3t+S2mPFoLx5zBpoJQmnIYoSWGQ53Od9YVsbf/jgPs4UlXEA== X-Received: by 2002:a05:600c:6016:b0:3dc:576c:ab07 with SMTP id az22-20020a05600c601600b003dc576cab07mr8402759wmb.14.1675171157124; Tue, 31 Jan 2023 05:19:17 -0800 (PST) Received: from platypus.lan ([2001:861:5e4c:3bb0:6424:328a:1734:3249]) by smtp.gmail.com with ESMTPSA id v14-20020a1cf70e000000b003db0b0cc2afsm19869924wmh.30.2023.01.31.05.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 05:19:16 -0800 (PST) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED] gccrs: session-manager: Add ast-pretty-expanded dump Date: Tue, 31 Jan 2023 14:22:46 +0100 Message-Id: <20230131132246.660779-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-16.0 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 List-Id: gcc/rust/ChangeLog: * rust-session-manager.cc (Session::compile_crate): Allow the dump of prettified AST (Session::dump_ast_pretty): New * rust-session-manager.h: Add new output file for pretty AST dump Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/rust/rust-session-manager.cc | 10 ++++++++-- gcc/rust/rust-session-manager.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc index 2b33ddfa601..157f5099155 100644 --- a/gcc/rust/rust-session-manager.cc +++ b/gcc/rust/rust-session-manager.cc @@ -58,6 +58,7 @@ namespace Rust { const char *kLexDumpFile = "gccrs.lex.dump"; 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 *kHIRDumpFile = "gccrs.hir.dump"; const char *kHIRPrettyDumpFile = "gccrs.hir-pretty.dump"; @@ -531,6 +532,7 @@ Session::compile_crate (const char *filename) // dump AST with expanded stuff rust_debug ("BEGIN POST-EXPANSION AST DUMP"); dump_ast_expanded (parser, parsed_crate); + dump_ast_pretty (parsed_crate, true); rust_debug ("END POST-EXPANSION AST DUMP"); } @@ -832,10 +834,14 @@ Session::dump_ast (Parser &parser, AST::Crate &crate) const } void -Session::dump_ast_pretty (AST::Crate &crate) const +Session::dump_ast_pretty (AST::Crate &crate, bool expanded) const { std::ofstream out; - out.open (kASTPrettyDumpFile); + if (expanded) + out.open (kASTPrettyDumpFileExpanded); + else + out.open (kASTPrettyDumpFile); + if (out.fail ()) { rust_error_at (Linemap::unknown_location (), "cannot open %s:%m; ignored", diff --git a/gcc/rust/rust-session-manager.h b/gcc/rust/rust-session-manager.h index 055aea6b7e6..db915991809 100644 --- a/gcc/rust/rust-session-manager.h +++ b/gcc/rust/rust-session-manager.h @@ -319,7 +319,7 @@ private: void dump_lex (Parser &parser) const; void dump_ast (Parser &parser, AST::Crate &crate) const; - void dump_ast_pretty (AST::Crate &crate) const; + void dump_ast_pretty (AST::Crate &crate, bool expanded = false) const; void dump_ast_expanded (Parser &parser, AST::Crate &crate) const; void dump_hir (HIR::Crate &crate) const; void dump_hir_pretty (HIR::Crate &crate) const; -- 2.39.1