Skip to content

Commit

Permalink
Auto merge of #86876 - jyn514:56935-target-crate-num, r=petrochenkov
Browse files Browse the repository at this point in the history
Reuse CrateNum for proc-macro crates even when cross-compiling

Proc-macros are always compiled for the host, so this should be the same
in every way as recompiling the crate.

I am not sure why the previous code special-cased the target, since the
compiler properly gives an error when trying to load a crate for a
different host:

```
error[E0461]: couldn't find crate `dependency` with expected target triple x86_64-unknown-linux-gnu
  --> /home/joshua/rustc4/src/test/ui/cfg-dependent.rs:8:2
   |
LL |     dependency::is_64();
   |     ^^^^^^^^^^
   |
   = note: the following crate versions were found:
           crate `dependency`, target triple i686-unknown-linux-gnu: /home/joshua/rustc4/build/x86_64-unknown-linux-gnu/test/ui/cfg-dependent/auxiliary/libdependency.so
```

I think another possible fix is to remove the check altogether. But I'm
not sure, and this fix works, so I'm not making the larger change here.

Fixes #56935.

r? `@petrochenkov` cc `@alexcrichton`
  • Loading branch information
bors committed Jul 15, 2021
2 parents 9c10781 + 68b9598 commit b919797
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
6 changes: 5 additions & 1 deletion compiler/rustc_metadata/src/creader.rs
Expand Up @@ -599,7 +599,11 @@ impl<'a> CrateLoader<'a> {
// don't want to match a host crate against an equivalent target one
// already loaded.
let root = library.metadata.get_root();
Ok(Some(if locator.triple == self.sess.opts.target_triple {
// FIXME: why is this condition necessary? It was adding in #33625 but I
// don't know why and the original author doesn't remember ...
let can_reuse_cratenum =
locator.triple == self.sess.opts.target_triple || locator.is_proc_macro == Some(true);
Ok(Some(if can_reuse_cratenum {
let mut result = LoadResult::Loaded(library);
self.cstore.iter_crate_data(|cnum, data| {
if data.name() == root.name() && root.hash() == data.hash() {
Expand Down
12 changes: 12 additions & 0 deletions src/test/ui/crate-loading/auxiliary/proc-macro.rs
@@ -0,0 +1,12 @@
// force-host
// no-prefer-dynamic
#![crate_name = "reproduction"]
#![crate_type = "proc-macro"]

extern crate proc_macro;
use proc_macro::TokenStream;

#[proc_macro]
pub fn mac(input: TokenStream) -> TokenStream {
input
}
8 changes: 8 additions & 0 deletions src/test/ui/crate-loading/cross-compiled-proc-macro.rs
@@ -0,0 +1,8 @@
// edition:2018
// compile-flags:--extern reproduction
// aux-build:proc-macro.rs
// check-pass

reproduction::mac!();

fn main() {}

0 comments on commit b919797

Please sign in to comment.