Skip to content

Commit a508006

Browse files
lambinoolambinoo
committed
local snapshot
1 parent fc24bce commit a508006

File tree

6 files changed

+66
-57
lines changed

6 files changed

+66
-57
lines changed

‎compiler/rustc_middle/src/ty/context.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::infer::canonical::{Canonical, CanonicalVarInfo, CanonicalVarInfos};
88
use crate::lint::{struct_lint_level, LintDiagnosticBuilder, LintLevelSource};
99
use crate::middle;
1010
use crate::middle::cstore::EncodedMetadata;
11+
use crate::middle::privacy::AccessLevel;
1112
use crate::middle::resolve_lifetime::{self, LifetimeScopeForPath, ObjectLifetimeDefault};
1213
use crate::middle::stability;
1314
use crate::mir::interpret::{self, AllocId, Allocation, ConstValue, Scalar};
@@ -1160,6 +1161,10 @@ impl<'tcx> TyCtxt<'tcx> {
11601161
)
11611162
}
11621163

1164+
pub fn get_resolver_access_level(self, def_id: DefId) -> Option<AccessLevel> {
1165+
self.gcx.untracked_resolutions.access_levels.get(&def_id).copied()
1166+
}
1167+
11631168
pub fn lift<T: Lift<'tcx>>(self, value: T) -> Option<T::Lifted> {
11641169
value.lift_to_tcx(self)
11651170
}

‎compiler/rustc_middle/src/ty/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pub use vtable::*;
2323
use crate::hir::exports::ExportMap;
2424
use crate::ich::StableHashingContext;
2525
use crate::middle::cstore::CrateStoreDyn;
26+
use crate::middle::privacy::AccessLevel;
2627
use crate::mir::{Body, GeneratorLayout};
2728
use crate::traits::{self, Reveal};
2829
use crate::ty;
@@ -118,6 +119,7 @@ pub struct ResolverOutputs {
118119
pub definitions: rustc_hir::definitions::Definitions,
119120
pub cstore: Box<CrateStoreDyn>,
120121
pub visibilities: FxHashMap<LocalDefId, Visibility>,
122+
pub access_levels: FxHashMap<DefId, AccessLevel>,
121123
pub extern_crate_map: FxHashMap<LocalDefId, CrateNum>,
122124
pub maybe_unused_trait_imports: FxHashSet<LocalDefId>,
123125
pub maybe_unused_extern_crates: Vec<(LocalDefId, Span)>,

‎compiler/rustc_privacy/src/lib.rs

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_data_structures::fx::FxHashSet;
1111
use rustc_errors::struct_span_err;
1212
use rustc_hir as hir;
1313
use rustc_hir::def::{DefKind, Res};
14-
use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
14+
use rustc_hir::def_id::{DefId, LocalDefId};
1515
use rustc_hir::intravisit::{self, DeepVisitor, NestedVisitorMap, Visitor};
1616
use rustc_hir::{AssocItemKind, HirIdSet, Node, PatKind};
1717
use rustc_middle::bug;
@@ -573,56 +573,6 @@ impl EmbargoVisitor<'tcx> {
573573
| DefKind::Generator => (),
574574
}
575575
}
576-
577-
/// Given the path segments of a `ItemKind::Use`, then we need
578-
/// to update the visibility of the intermediate use so that it isn't linted
579-
/// by `unreachable_pub`.
580-
///
581-
/// This isn't trivial as `path.res` has the `DefId` of the eventual target
582-
/// of the use statement not of the next intermediate use statement.
583-
///
584-
/// To do this, consider the last two segments of the path to our intermediate
585-
/// use statement. We expect the penultimate segment to be a module and the
586-
/// last segment to be the name of the item we are exporting. We can then
587-
/// look at the items contained in the module for the use statement with that
588-
/// name and update that item's visibility.
589-
///
590-
/// FIXME: This solution won't work with glob imports and doesn't respect
591-
/// namespaces. See <https://github.com/rust-lang/rust/pull/57922#discussion_r251234202>.
592-
fn update_visibility_of_intermediate_use_statements(
593-
&mut self,
594-
segments: &[hir::PathSegment<'_>],
595-
) {
596-
if let [.., module, segment] = segments {
597-
if let Some(item) = module
598-
.res
599-
.and_then(|res| res.mod_def_id())
600-
// If the module is `self`, i.e. the current crate,
601-
// there will be no corresponding item.
602-
.filter(|def_id| def_id.index != CRATE_DEF_INDEX || def_id.krate != LOCAL_CRATE)
603-
.and_then(|def_id| {
604-
def_id.as_local().map(|def_id| self.tcx.hir().local_def_id_to_hir_id(def_id))
605-
})
606-
.map(|module_hir_id| self.tcx.hir().expect_item(module_hir_id))
607-
{
608-
if let hir::ItemKind::Mod(m) = &item.kind {
609-
for &item_id in m.item_ids {
610-
let item = self.tcx.hir().item(item_id);
611-
if !self.tcx.hygienic_eq(
612-
segment.ident,
613-
item.ident,
614-
item_id.def_id.to_def_id(),
615-
) {
616-
continue;
617-
}
618-
if let hir::ItemKind::Use(..) = item.kind {
619-
self.update(item.hir_id(), Some(AccessLevel::Exported));
620-
}
621-
}
622-
}
623-
}
624-
}
625-
}
626576
}
627577

628578
impl Visitor<'tcx> for EmbargoVisitor<'tcx> {
@@ -730,9 +680,11 @@ impl Visitor<'tcx> for EmbargoVisitor<'tcx> {
730680
// Re-exports are handled in `visit_mod`. However, in order to avoid looping over
731681
// all of the items of a mod in `visit_mod` looking for use statements, we handle
732682
// making sure that intermediate use statements have their visibilities updated here.
733-
hir::ItemKind::Use(ref path, _) => {
734-
if item_level.is_some() {
735-
self.update_visibility_of_intermediate_use_statements(path.segments.as_ref());
683+
hir::ItemKind::Use(ref path, ..) => {
684+
tracing::trace!("item: def_id={:?}, last_segment: {:?}", item.def_id.to_def_id(), path.segments.last());
685+
if item.vis.node.is_pub() {
686+
let access_level = self.tcx.get_resolver_access_level(item.def_id.to_def_id());
687+
self.update(item.hir_id(), access_level);
736688
}
737689
}
738690
// The interface is empty.

‎compiler/rustc_resolve/src/build_reduced_graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
397397
used: Cell::new(false),
398398
});
399399

400-
debug!("add_import({:?})", import);
400+
debug!("add_import({:#?})", import);
401401

402402
self.r.indeterminate_imports.push(import);
403403
match import.kind {

‎compiler/rustc_resolve/src/imports.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ impl<'a> Resolver<'a> {
265265
let resolution =
266266
self.resolution(module, key).try_borrow_mut().map_err(|_| (Determined, Weak::No))?; // This happens when there is a cycle of imports.
267267

268+
tracing::info!("resolve_ident: module={:?}, ident={:?}", module, ident);
269+
268270
if let Some(binding) = resolution.binding {
269271
if !restricted_shadowing && binding.expansion != LocalExpnId::ROOT {
270272
if let NameBindingKind::Res(_, true) = binding.kind {
@@ -836,7 +838,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
836838
import.span,
837839
);
838840
import.vis.set(orig_vis);
839-
841+
tracing::trace!("resolve_import: determinacy: {:?}", binding.map(|binding| binding.span));
840842
source_bindings[ns].set(binding);
841843
} else {
842844
return;

‎compiler/rustc_resolve/src/lib.rs

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ use rustc_index::vec::IndexVec;
4646
use rustc_metadata::creader::{CStore, CrateLoader};
4747
use rustc_middle::hir::exports::ExportMap;
4848
use rustc_middle::middle::cstore::{CrateStore, MetadataLoaderDyn};
49+
use rustc_middle::middle::privacy::AccessLevel;
4950
use rustc_middle::span_bug;
5051
use rustc_middle::ty::query::Providers;
51-
use rustc_middle::ty::{self, DefIdTree, MainDefinition, ResolverOutputs};
52+
use rustc_middle::ty::{self, DefIdTree, MainDefinition, ResolverOutputs, Visibility};
5253
use rustc_session::lint;
5354
use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
5455
use rustc_session::Session;
@@ -1032,6 +1033,8 @@ pub struct Resolver<'a> {
10321033
legacy_const_generic_args: FxHashMap<DefId, Option<Vec<usize>>>,
10331034

10341035
main_def: Option<MainDefinition>,
1036+
1037+
node_privacy: FxHashMap<DefId, AccessLevel>
10351038
}
10361039

10371040
/// Nothing really interesting here; it just provides memory for the rest of the crate.
@@ -1393,6 +1396,8 @@ impl<'a> Resolver<'a> {
13931396
trait_impl_items: Default::default(),
13941397
legacy_const_generic_args: Default::default(),
13951398
main_def: Default::default(),
1399+
1400+
node_privacy: Default::default(),
13961401
};
13971402

13981403
let root_parent_scope = ParentScope::module(graph_root, &resolver);
@@ -1435,10 +1440,12 @@ impl<'a> Resolver<'a> {
14351440
let maybe_unused_extern_crates = self.maybe_unused_extern_crates;
14361441
let glob_map = self.glob_map;
14371442
let main_def = self.main_def;
1443+
let access_levels = self.node_privacy;
14381444
ResolverOutputs {
14391445
definitions,
14401446
cstore: Box::new(self.crate_loader.into_cstore()),
14411447
visibilities,
1448+
access_levels,
14421449
extern_crate_map,
14431450
export_map,
14441451
glob_map,
@@ -1456,6 +1463,7 @@ impl<'a> Resolver<'a> {
14561463
pub fn clone_outputs(&self) -> ResolverOutputs {
14571464
ResolverOutputs {
14581465
definitions: self.definitions.clone(),
1466+
access_levels: self.node_privacy.clone(),
14591467
cstore: Box::new(self.cstore().clone()),
14601468
visibilities: self.visibilities.clone(),
14611469
extern_crate_map: self.extern_crate_map.clone(),
@@ -1512,6 +1520,7 @@ impl<'a> Resolver<'a> {
15121520
pub fn resolve_crate(&mut self, krate: &Crate) {
15131521
self.session.time("resolve_crate", || {
15141522
self.session.time("finalize_imports", || ImportResolver { r: self }.finalize_imports());
1523+
self.session.time("prepare_privacy", || self.prepare_privacy());
15151524
self.session.time("finalize_macro_resolutions", || self.finalize_macro_resolutions());
15161525
self.session.time("late_resolve_crate", || self.late_resolve_crate(krate));
15171526
self.session.time("resolve_main", || self.resolve_main());
@@ -1521,6 +1530,45 @@ impl<'a> Resolver<'a> {
15211530
});
15221531
}
15231532

1533+
fn prepare_privacy(&mut self) {
1534+
let root = self.graph_root();
1535+
1536+
if let Some(def_id) = root.def_id() {
1537+
if let Some(exports) = self.export_map.get(&def_id.expect_local()).cloned() {
1538+
tracing::trace!("exports={:?}", exports);
1539+
let public_exports = exports.iter().filter(|ex| ex.vis == Visibility::Public).collect::<Vec<_>>();
1540+
for export in public_exports.into_iter() {
1541+
self.per_ns(|this, ns| {
1542+
let new_key = this.new_key(export.ident, ns);
1543+
let name_res = this.resolution(root, new_key);
1544+
if let Some(binding) = name_res.borrow().binding() {
1545+
this.recursive_define_access_level(binding, AccessLevel::Public, 30);
1546+
}
1547+
});
1548+
}
1549+
}
1550+
}
1551+
1552+
tracing::info!("node_privacy: {:#?}", self.node_privacy);
1553+
}
1554+
1555+
fn recursive_define_access_level(&mut self, binding: &NameBinding<'a>, access_level: AccessLevel, max_recurse: usize) {
1556+
// Is this useful in case of very very veryyyyyy deep nesting?
1557+
if max_recurse == 0 {
1558+
return;
1559+
}
1560+
1561+
if let NameBindingKind::Import { binding, import, .. } = binding.kind {
1562+
let def_id = self.opt_local_def_id(import.id).map(|local_def_id| local_def_id.to_def_id());
1563+
if let Some(def_id) = def_id {
1564+
tracing::trace!("binding found! import.id={:?} def_id={:?}", import.id, def_id);
1565+
self.node_privacy.insert(def_id, access_level);
1566+
}
1567+
1568+
self.recursive_define_access_level(binding, AccessLevel::Exported, max_recurse - 1);
1569+
}
1570+
}
1571+
15241572
pub fn traits_in_scope(
15251573
&mut self,
15261574
current_trait: Option<Module<'a>>,

0 commit comments

Comments
 (0)