From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id AE01F3816674; Wed, 8 Jun 2022 12:11:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE01F3816674 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] builtins: Add file!() macro X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: bf92a1012264f2544e73a7a8dd0ac1e473c7f658 X-Git-Newrev: 986b8c3c6024409beedc662fbe08345450a60cc2 Message-Id: <20220608121153.AE01F3816674@sourceware.org> Date: Wed, 8 Jun 2022 12:11:53 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:11:53 -0000 https://gcc.gnu.org/g:986b8c3c6024409beedc662fbe08345450a60cc2 commit 986b8c3c6024409beedc662fbe08345450a60cc2 Author: Arthur Cohen Date: Wed Feb 23 10:48:49 2022 +0100 builtins: Add file!() macro Diff: --- gcc/rust/expand/rust-macro-builtins.cc | 15 +++++++++++++++ gcc/rust/expand/rust-macro-builtins.h | 3 +++ gcc/rust/util/rust-hir-map.cc | 1 + 3 files changed, 19 insertions(+) diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index b7bbd32c322..2678fe43a1e 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -18,6 +18,8 @@ #include "rust-macro-builtins.h" #include "rust-diagnostics.h" +#include "rust-expr.h" +#include "rust-session-manager.h" namespace Rust { AST::ASTFragment @@ -27,4 +29,17 @@ MacroBuiltin::assert (Location invoc_locus, AST::MacroInvocData &invoc) return AST::ASTFragment::create_empty (); } + +AST::ASTFragment +MacroBuiltin::file (Location invoc_locus, AST::MacroInvocData &invoc) +{ + auto current_file + = Session::get_instance ().linemap->location_file (invoc_locus); + auto file_str = AST::SingleASTNode (std::unique_ptr ( + new AST::LiteralExpr (current_file, AST::Literal::STRING, + PrimitiveCoreType::CORETYPE_STR, + std::vector (), invoc_locus))); + + return AST::ASTFragment ({file_str}); +} } // namespace Rust diff --git a/gcc/rust/expand/rust-macro-builtins.h b/gcc/rust/expand/rust-macro-builtins.h index f279d390ffe..ee42fe1dcc6 100644 --- a/gcc/rust/expand/rust-macro-builtins.h +++ b/gcc/rust/expand/rust-macro-builtins.h @@ -28,6 +28,9 @@ class MacroBuiltin public: static AST::ASTFragment assert (Location invoc_locus, AST::MacroInvocData &invoc); + + static AST::ASTFragment file (Location invoc_locus, + AST::MacroInvocData &invoc); }; } // namespace Rust diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index 1c0e8fcb9ca..d154a8aab2b 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -746,6 +746,7 @@ Mappings::insert_macro_def (AST::MacroRulesDefinition *macro) Location, AST::MacroInvocData &)>> builtin_macros = { {"assert", MacroBuiltin::assert}, + {"file", MacroBuiltin::file}, }; auto builtin = builtin_macros.find (macro->get_rule_name ());