Skip to content

Fixed the private-dependency bug #122757

New issue

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

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 16 additions & 11 deletions compiler/rustc_metadata/src/creader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,15 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
None
}

// The `dependency` type is determined by the command line arguments(`--extern`) and
// `private_dep`. However, sometimes the directly dependent crate is not specified by
// `--extern`, in this case, `private-dep` is none during loading. This is equivalent to the
// scenario where the command parameter is set to `public-dependency`
fn is_private_dep(&self, name: &str, private_dep: Option<bool>) -> bool {
self.sess.opts.externs.get(name).map_or(private_dep.unwrap_or(false), |e| e.is_private_dep)
&& private_dep.unwrap_or(true)
}

fn register_crate(
&mut self,
host_lib: Option<Library>,
Expand All @@ -402,14 +411,7 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
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());

let private_dep = self
.sess
.opts
.externs
.get(name.as_str())
.map_or(private_dep.unwrap_or(false), |e| e.is_private_dep)
&& private_dep.unwrap_or(true);
let private_dep = self.is_private_dep(name.as_str(), private_dep);

// Claim this crate number and cache it
let cnum = self.cstore.intern_stable_crate_id(&crate_root)?;
Expand Down Expand Up @@ -599,14 +601,17 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {

match result {
(LoadResult::Previous(cnum), None) => {
// When `private_dep` is none, it indicates the directly dependent crate. If it is
// not specified by `--extern` on command line parameters, it may be
// `private-dependency` when `register_crate` is called for the first time. Then it must be updated to
// `public-dependency` here.
let private_dep = self.is_private_dep(name.as_str(), private_dep);
let data = self.cstore.get_crate_data_mut(cnum);
if data.is_proc_macro_crate() {
dep_kind = CrateDepKind::MacrosOnly;
}
data.set_dep_kind(cmp::max(data.dep_kind(), dep_kind));
if let Some(private_dep) = private_dep {
data.update_and_private_dep(private_dep);
}
data.update_and_private_dep(private_dep);
Ok(cnum)
}
(LoadResult::Loaded(library), host_library) => {
Expand Down
6 changes: 6 additions & 0 deletions tests/ui/privacy/pub-priv-dep/auxiliary/bar.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
//@ aux-crate:priv:foo=foo.rs
//@ compile-flags: -Zunstable-options

#![crate_type = "rlib"]
extern crate foo;
pub struct Bar(pub i32);
2 changes: 2 additions & 0 deletions tests/ui/privacy/pub-priv-dep/auxiliary/foo.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#![crate_type = "rlib"]
pub struct Foo(pub i32);
12 changes: 12 additions & 0 deletions tests/ui/privacy/pub-priv-dep/priv-dep-issue-122756.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//@ aux-build: bar.rs
//@ aux-build: foo.rs
//@ build-pass

#![deny(exported_private_dependencies)]

// Ensure the libbar.rlib is loaded first. If the command line parameter `--extern foo` does not
// exist, previus version would fail to compile
#![crate_type = "rlib"]
extern crate bar;
extern crate foo;
pub fn baz() -> (Option<foo::Foo>, Option<bar::Bar>) { (None, None) }