From 9d1d633099ba51c161209890de6102373660f3ff Mon Sep 17 00:00:00 2001 From: Nikos Alexandris Date: Thu, 2 Mar 2023 03:14:46 +0200 Subject: gccrs: Add location info when opening a file fails in include_str and include_bytes. Resolves issue #1872 gcc/rust/ChangeLog: * expand/rust-macro-builtins.cc (load_file_bytes): Add location parameter. (MacroBuiltin::include_bytes_handler): Pass location to load_file_bytes. (MacroBuiltin::include_str_handler): Pass location to load_file_bytes. gcc/testsuite/ChangeLog: * rust/compile/builtin_macro_include_bytes_location_info.rs: New test. * rust/compile/builtin_macro_include_str_location_info.rs: New test. Signed-off-by: Nikos Alexandris --- gcc/rust/expand/rust-macro-builtins.cc | 12 +++++++----- .../compile/builtin_macro_include_bytes_location_info.rs | 10 ++++++++++ .../rust/compile/builtin_macro_include_str_location_info.rs | 10 ++++++++++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/rust/compile/builtin_macro_include_bytes_location_info.rs create mode 100644 gcc/testsuite/rust/compile/builtin_macro_include_str_location_info.rs (limited to 'gcc') diff --git a/gcc/rust/expand/rust-macro-builtins.cc b/gcc/rust/expand/rust-macro-builtins.cc index 5cebcf8..2bd8120 100644 --- a/gcc/rust/expand/rust-macro-builtins.cc +++ b/gcc/rust/expand/rust-macro-builtins.cc @@ -308,12 +308,12 @@ source_relative_path (std::string path, Location locus) FIXME: platform specific. */ std::vector -load_file_bytes (const char *filename) +load_file_bytes (Location invoc_locus, const char *filename) { RAIIFile file_wrap (filename); if (file_wrap.get_raw () == nullptr) { - rust_error_at (Location (), "cannot open filename %s: %m", filename); + rust_error_at (invoc_locus, "cannot open filename %s: %m", filename); return std::vector (); } @@ -326,7 +326,7 @@ load_file_bytes (const char *filename) if (fread (&buf[0], fsize, 1, f) != 1) { - rust_error_at (Location (), "error reading file %s: %m", filename); + rust_error_at (invoc_locus, "error reading file %s: %m", filename); return std::vector (); } @@ -391,7 +391,8 @@ MacroBuiltin::include_bytes_handler (Location invoc_locus, std::string target_filename = source_relative_path (lit_expr->as_string (), invoc_locus); - std::vector bytes = load_file_bytes (target_filename.c_str ()); + std::vector bytes + = load_file_bytes (invoc_locus, target_filename.c_str ()); /* Is there a more efficient way to do this? */ std::vector> elts; @@ -455,7 +456,8 @@ MacroBuiltin::include_str_handler (Location invoc_locus, std::string target_filename = source_relative_path (lit_expr->as_string (), invoc_locus); - std::vector bytes = load_file_bytes (target_filename.c_str ()); + std::vector bytes + = load_file_bytes (invoc_locus, target_filename.c_str ()); /* FIXME: reuse lexer */ int expect_single = 0; diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_bytes_location_info.rs b/gcc/testsuite/rust/compile/builtin_macro_include_bytes_location_info.rs new file mode 100644 index 0000000..98bf53b --- /dev/null +++ b/gcc/testsuite/rust/compile/builtin_macro_include_bytes_location_info.rs @@ -0,0 +1,10 @@ +#![feature(rustc_attrs)] + +#[rustc_builtin_macro] +macro_rules! include_bytes { + () => {{}}; +} + +fn main() { + include_bytes!("nonexistent.txt"); // { dg-error "cannot open filename (.*?)nonexistent.txt: No such file or directory" } +} diff --git a/gcc/testsuite/rust/compile/builtin_macro_include_str_location_info.rs b/gcc/testsuite/rust/compile/builtin_macro_include_str_location_info.rs new file mode 100644 index 0000000..a946033 --- /dev/null +++ b/gcc/testsuite/rust/compile/builtin_macro_include_str_location_info.rs @@ -0,0 +1,10 @@ +#![feature(rustc_attrs)] + +#[rustc_builtin_macro] +macro_rules! include_str { + () => {{}}; +} + +fn main() { + include_str!("nonexistent.txt"); // { dg-error "cannot open filename (.*?)nonexistent.txt: No such file or directory" } +} -- cgit v1.1