Skip to content

update_extern_crate belongs to CrateMetadata and make dependencies field private #66028

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 5 commits into from
Closed

update_extern_crate belongs to CrateMetadata and make dependencies field private #66028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcd13d4
Move CrateMetadata impl block to where CrateMetadata is defined
spastorino Oct 30, 2019
147d03c
Make fields with sync types on CrateMetadata private
spastorino Oct 31, 2019
69a021f
Make CrateMetadata dep_kind private
spastorino Nov 1, 2019
6f9bfda
update_extern_crate belongs to CrateMetadata
spastorino Nov 1, 2019
f86fefa
Make CrateMetadata dependencies private
spastorino Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 19 additions & 64 deletions src/librustc_metadata/creader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
use crate::cstore::{self, CStore, MetadataBlob};
use crate::locator::{self, CratePaths};
use crate::schema::{CrateRoot, CrateDep};
use rustc_data_structures::sync::{Lock, Once, AtomicCell};

use rustc::hir::def_id::CrateNum;
use rustc_data_structures::svh::Svh;
use rustc::dep_graph::DepNodeIndex;
use rustc::middle::cstore::DepKind;
use rustc::mir::interpret::AllocDecodingState;
use rustc::session::{Session, CrateDisambiguator};
use rustc::session::config::{Sanitizer, self};
use rustc_target::spec::{PanicStrategy, TargetTriple};
Expand All @@ -21,7 +18,7 @@ use rustc::hir::map::Definitions;
use rustc::hir::def_id::LOCAL_CRATE;

use std::path::Path;
use std::{cmp, fs};
use std::fs;

use syntax::ast;
use syntax::attr;
Expand Down Expand Up @@ -52,7 +49,7 @@ fn dump_crates(cstore: &CStore) {
info!(" name: {}", data.root.name);
info!(" cnum: {}", data.cnum);
info!(" hash: {}", data.root.hash);
info!(" reqd: {:?}", *data.dep_kind.lock());
info!(" reqd: {:?}", data.get_dep_kind());
let CrateSource { dylib, rlib, rmeta } = data.source.clone();
dylib.map(|dl| info!(" dylib: {}", dl.0.display()));
rlib.map(|rl| info!(" rlib: {}", rl.0.display()));
Expand Down Expand Up @@ -241,24 +238,21 @@ impl<'a> CrateLoader<'a> {
crate_root.def_path_table.decode((&metadata, self.sess))
});

self.cstore.set_crate_data(cnum, cstore::CrateMetadata {
extern_crate: Lock::new(None),
self.cstore.set_crate_data(cnum, cstore::CrateMetadata::new(
def_path_table,
trait_impls,
root: crate_root,
crate_root,
host_hash,
blob: metadata,
metadata,
cnum_map,
cnum,
dependencies: Lock::new(dependencies),
source_map_import_info: Once::new(),
alloc_decoding_state: AllocDecodingState::new(interpret_alloc_index),
dep_kind: Lock::new(dep_kind),
dependencies,
interpret_alloc_index,
dep_kind,
source,
private_dep,
raw_proc_macros,
dep_node_index: AtomicCell::new(DepNodeIndex::INVALID),
});
));

cnum
}
Expand Down Expand Up @@ -381,9 +375,7 @@ impl<'a> CrateLoader<'a> {
if data.root.proc_macro_data.is_some() {
dep_kind = DepKind::UnexportedMacrosOnly;
}
data.dep_kind.with_lock(|data_dep_kind| {
*data_dep_kind = cmp::max(*data_dep_kind, dep_kind);
});
data.set_max_dep_kind(dep_kind);
Ok(cnum)
}
(LoadResult::Loaded(library), host_library) => {
Expand Down Expand Up @@ -420,47 +412,6 @@ impl<'a> CrateLoader<'a> {
}
}

fn update_extern_crate(&self,
cnum: CrateNum,
mut extern_crate: ExternCrate,
visited: &mut FxHashSet<(CrateNum, bool)>)
{
if !visited.insert((cnum, extern_crate.is_direct())) { return }

let cmeta = self.cstore.get_crate_data(cnum);
let mut old_extern_crate = cmeta.extern_crate.borrow_mut();

// Prefer:
// - something over nothing (tuple.0);
// - direct extern crate to indirect (tuple.1);
// - shorter paths to longer (tuple.2).
let new_rank = (
true,
extern_crate.is_direct(),
cmp::Reverse(extern_crate.path_len),
);
let old_rank = match *old_extern_crate {
None => (false, false, cmp::Reverse(usize::max_value())),
Some(ref c) => (
true,
c.is_direct(),
cmp::Reverse(c.path_len),
),
};
if old_rank >= new_rank {
return; // no change needed
}

*old_extern_crate = Some(extern_crate);
drop(old_extern_crate);

// Propagate the extern crate info to dependencies.
extern_crate.dependency_of = cnum;
for &dep_cnum in cmeta.dependencies.borrow().iter() {
self.update_extern_crate(dep_cnum, extern_crate, visited);
}
}

// Go through the crate metadata and load any crates that it references
fn resolve_crate_deps(&mut self,
root: &CratePaths,
Expand Down Expand Up @@ -555,7 +506,7 @@ impl<'a> CrateLoader<'a> {
// #![panic_runtime] crate.
self.inject_dependency_if(cnum, "a panic runtime",
&|data| data.root.needs_panic_runtime);
runtime_found = runtime_found || *data.dep_kind.lock() == DepKind::Explicit;
runtime_found = runtime_found || data.get_dep_kind() == DepKind::Explicit;
}
});

Expand Down Expand Up @@ -855,7 +806,7 @@ impl<'a> CrateLoader<'a> {
}

info!("injecting a dep from {} to {}", cnum, krate);
data.dependencies.borrow_mut().push(krate);
data.push_dependency(krate);
});
}

Expand Down Expand Up @@ -897,7 +848,9 @@ impl<'a> CrateLoader<'a> {

let def_id = definitions.opt_local_def_id(item.id).unwrap();
let path_len = definitions.def_path(def_id.index).data.len();
self.update_extern_crate(

let cmeta = self.cstore.get_crate_data(cnum);
cmeta.update_extern_crate(
cnum,
ExternCrate {
src: ExternCrateSource::Extern(def_id),
Expand All @@ -916,7 +869,8 @@ impl<'a> CrateLoader<'a> {
pub fn process_path_extern(&mut self, name: Symbol, span: Span) -> CrateNum {
let cnum = self.resolve_crate(name, span, DepKind::Explicit, None);

self.update_extern_crate(
let cmeta = self.cstore.get_crate_data(cnum);
cmeta.update_extern_crate(
cnum,
ExternCrate {
src: ExternCrateSource::Path,
Expand All @@ -934,7 +888,8 @@ impl<'a> CrateLoader<'a> {
pub fn maybe_process_path_extern(&mut self, name: Symbol, span: Span) -> Option<CrateNum> {
let cnum = self.maybe_resolve_crate(name, span, DepKind::Explicit, None).ok()?;

self.update_extern_crate(
let cmeta = self.cstore.get_crate_data(cnum);
cmeta.update_extern_crate(
cnum,
ExternCrate {
src: ExternCrateSource::Path,
Expand Down
Loading