mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustc_metadata: fix private_dep logic in register_crate

Browse Source
This commit is contained in:
Michael Howell 2023-05-08 12:06:21 -07:00
parent 374024336a
commit 0ca70be11b
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/rustc_metadata/src/creader.rs
View File

@ -365,7 +365,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
lib: Library, lib: Library,
dep_kind: CrateDepKind, dep_kind: CrateDepKind,
name: Symbol, name: Symbol,
private_dep: bool, private_dep: Option<bool>,
) -> Result<CrateNum, CrateError> { ) -> Result<CrateNum, CrateError> {
let _prof_timer = self.sess.prof.generic_activity("metadata_register_crate"); let _prof_timer = self.sess.prof.generic_activity("metadata_register_crate");
@ -373,8 +373,13 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
let crate_root = metadata.get_root(); let crate_root = metadata.get_root();
let host_hash = host_lib.as_ref().map(|lib| lib.metadata.get_root().hash()); let host_hash = host_lib.as_ref().map(|lib| lib.metadata.get_root().hash());
let private_dep = let private_dep = self
self.sess.opts.externs.get(name.as_str()).is_some_and(|e| e.is_private_dep); .sess
.opts
.externs
.get(name.as_str())
.map_or(private_dep.unwrap_or(false), |e| e.is_private_dep)
&& private_dep.unwrap_or(true);
// Claim this crate number and cache it // Claim this crate number and cache it
let cnum = self.cstore.intern_stable_crate_id(&crate_root)?; let cnum = self.cstore.intern_stable_crate_id(&crate_root)?;
@ -526,9 +531,9 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
dep.host_hash, dep.host_hash,
Some(&dep.extra_filename[..]), Some(&dep.extra_filename[..]),
PathKind::Dependency, PathKind::Dependency,
dep.is_private, Some(dep.is_private),
), ),
None => (None, None, None, None, PathKind::Crate, false), None => (None, None, None, None, PathKind::Crate, None),
}; };
let result = if let Some(cnum) = self.existing_match(name, hash, path_kind) { let result = if let Some(cnum) = self.existing_match(name, hash, path_kind) {
(LoadResult::Previous(cnum), None) (LoadResult::Previous(cnum), None)
@ -564,7 +569,9 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
dep_kind = CrateDepKind::MacrosOnly; dep_kind = CrateDepKind::MacrosOnly;
} }
data.update_dep_kind(|data_dep_kind| cmp::max(data_dep_kind, dep_kind)); data.update_dep_kind(|data_dep_kind| cmp::max(data_dep_kind, dep_kind));
data.update_private_dep(|p_d| p_d && private_dep); if let Some(private_dep) = private_dep {
data.update_private_dep(|p_d| p_d && private_dep);
}
Ok(cnum) Ok(cnum)
} }
(LoadResult::Loaded(library), host_library) => { (LoadResult::Loaded(library), host_library) => {