diff options
| -rw-r--r-- | gcc/rust/expand/rust-proc-macro.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/metadata/rust-imports.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/rust/expand/rust-proc-macro.cc b/gcc/rust/expand/rust-proc-macro.cc index 6ba87b6..acd7f71 100644 --- a/gcc/rust/expand/rust-proc-macro.cc +++ b/gcc/rust/expand/rust-proc-macro.cc @@ -115,7 +115,7 @@ load_macros (std::string path) const ProcMacro::ProcmacroArray *array = load_macros_array (path); // Did not load the proc macro if (array == nullptr) - rust_unreachable (); + return {}; rust_debug ("Found %lu procedural macros", array->length); diff --git a/gcc/rust/metadata/rust-imports.cc b/gcc/rust/metadata/rust-imports.cc index 436c595..6c122c8 100644 --- a/gcc/rust/metadata/rust-imports.cc +++ b/gcc/rust/metadata/rust-imports.cc @@ -164,11 +164,13 @@ Import::try_package_in_directory (const std::string &filename, return std::make_pair (nullptr, std::vector<ProcMacro::Procmacro>{}); } + auto macros = load_macros (found_filename); + // The export data may not be in this file. std::unique_ptr<Stream> s = Import::find_export_data (found_filename, fd, location); if (s != nullptr) - return std::make_pair (std::move (s), std::vector<ProcMacro::Procmacro>{}); + return std::make_pair (std::move (s), macros); close (fd); @@ -176,7 +178,7 @@ Import::try_package_in_directory (const std::string &filename, "%s exists but does not contain any Rust export data", found_filename.c_str ()); - return std::make_pair (NULL, std::vector<ProcMacro::Procmacro>{}); + return std::make_pair (NULL, macros); } // Given import "*PFILENAME", where *PFILENAME does not exist, try |