bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #83404 - michaelwoerister:issue83045, r=eddyb

Browse source 
Fix #83045 by moving some crate loading verification code to a better place

r? `@eddyb`
This commit is contained in:
bors 2021-03-26 14:39:02 +00:00
commit b8719c51e0
5 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/rustc_metadata/src/creader.rs
View file

@ -350,7 +350,6 @@ impl<'a> CrateLoader<'a> {
let Library { source, metadata } = lib;
let crate_root = metadata.get_root();
let host_hash = host_lib.as_ref().map(|lib| lib.metadata.get_root().hash());
self.verify_no_symbol_conflicts(&crate_root)?;
let private_dep =
self.sess.opts.externs.get(&name.as_str()).map_or(false, |e| e.is_private_dep);
@ -358,8 +357,6 @@ impl<'a> CrateLoader<'a> {
// Claim this crate number and cache it
let cnum = self.cstore.alloc_new_crate_num();
self.verify_no_stable_crate_id_hash_conflicts(&crate_root, cnum)?;
info!(
"register crate `{}` (cnum = {}. private_dep = {})",
crate_root.name(),
@ -394,6 +391,14 @@ impl<'a> CrateLoader<'a> {
None
};
// Perform some verification *after* resolve_crate_deps() above is
// known to have been successful. It seems that - in error cases - the
// cstore can be in a temporarily invalid state between cnum allocation
// and dependency resolution and the verification code would produce
// ICEs in that case (see #83045).
self.verify_no_symbol_conflicts(&crate_root)?;
self.verify_no_stable_crate_id_hash_conflicts(&crate_root, cnum)?;
let crate_metadata = CrateMetadata::new(
self.sess,
metadata,