Skip to content

Commit f5a9f6f

Browse files
petrochenkovpetrochenkov
committed
rustc_metadata: Filter encoded data more aggressively using DefKind 
1 parent 9dd27b3 commit f5a9f6f

File tree

6 files changed

+164
-24
lines changed

6 files changed

+164
-24
lines changed

‎compiler/rustc_hir_analysis/src/astconv/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2580,7 +2580,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
25802580
tcx.all_impls(trait_def_id)
25812581
.filter(|impl_def_id| {
25822582
// Consider only accessible traits
2583-
tcx.visibility(*impl_def_id).is_accessible_from(self.item_def_id(), tcx)
2583+
tcx.visibility(trait_def_id).is_accessible_from(self.item_def_id(), tcx)
25842584
&& tcx.impl_polarity(impl_def_id) != ty::ImplPolarity::Negative
25852585
})
25862586
.filter_map(|impl_def_id| tcx.impl_trait_ref(impl_def_id))

‎compiler/rustc_metadata/src/rmeta/decoder.rs

+19-5
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,10 @@ impl CrateRoot {
749749
}
750750

751751
impl<'a, 'tcx> CrateMetadataRef<'a> {
752+
fn missing(self, descr: &str, id: DefIndex) -> ! {
753+
bug!("missing `{descr}` for {:?}", self.local_def_id(id))
754+
}
755+
752756
fn raw_proc_macro(self, id: DefIndex) -> &'a ProcMacro {
753757
// DefIndex's in root.proc_macro_data have a one-to-one correspondence
754758
// with items in 'raw_proc_macros'.
@@ -782,8 +786,13 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
782786

783787
fn opt_item_ident(self, item_index: DefIndex, sess: &Session) -> Option<Ident> {
784788
let name = self.opt_item_name(item_index)?;
785-
let span =
786-
self.root.tables.def_ident_span.get(self, item_index).unwrap().decode((self, sess));
789+
let span = self
790+
.root
791+
.tables
792+
.def_ident_span
793+
.get(self, item_index)
794+
.unwrap_or_else(|| self.missing("def_ident_span", item_index))
795+
.decode((self, sess));
787796
Some(Ident::new(name, span))
788797
}
789798

@@ -812,7 +821,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
812821
.tables
813822
.def_span
814823
.get(self, index)
815-
.unwrap_or_else(|| panic!("Missing span for {index:?}"))
824+
.unwrap_or_else(|| self.missing("def_span", index))
816825
.decode((self, sess))
817826
}
818827

@@ -924,7 +933,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
924933
.tables
925934
.visibility
926935
.get(self, id)
927-
.unwrap()
936+
.unwrap_or_else(|| self.missing("visibility", id))
928937
.decode(self)
929938
.map_id(|index| self.local_def_id(index))
930939
}
@@ -934,7 +943,12 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
934943
}
935944

936945
fn get_expn_that_defined(self, id: DefIndex, sess: &Session) -> ExpnId {
937-
self.root.tables.expn_that_defined.get(self, id).unwrap().decode((self, sess))
946+
self.root
947+
.tables
948+
.expn_that_defined
949+
.get(self, id)
950+
.unwrap_or_else(|| self.missing("expn_that_defined", id))
951+
.decode((self, sess))
938952
}
939953

940954
fn get_debugger_visualizers(self) -> Vec<rustc_span::DebuggerVisualizerFile> {

‎compiler/rustc_metadata/src/rmeta/encoder.rs

+127-10
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ fn analyze_attr(attr: &Attribute, state: &mut AnalyzeAttrState) -> bool {
811811
should_encode
812812
}
813813

814-
fn should_encode_visibility(def_kind: DefKind) -> bool {
814+
fn should_encode_span(def_kind: DefKind) -> bool {
815815
match def_kind {
816816
DefKind::Mod
817817
| DefKind::Struct
@@ -823,25 +823,136 @@ fn should_encode_visibility(def_kind: DefKind) -> bool {
823823
| DefKind::ForeignTy
824824
| DefKind::TraitAlias
825825
| DefKind::AssocTy
826+
| DefKind::TyParam
826827
| DefKind::Fn
827828
| DefKind::Const
828-
| DefKind::Static(..)
829+
| DefKind::Static(_)
829830
| DefKind::Ctor(..)
830831
| DefKind::AssocFn
831832
| DefKind::AssocConst
832-
| DefKind::Macro(..)
833+
| DefKind::Macro(_)
834+
| DefKind::AnonConst
835+
| DefKind::InlineConst
836+
| DefKind::OpaqueTy
837+
| DefKind::Field
838+
| DefKind::Impl { .. }
839+
| DefKind::Closure
840+
| DefKind::Generator => true,
841+
DefKind::ConstParam
842+
| DefKind::ExternCrate
833843
| DefKind::Use
834844
| DefKind::ForeignMod
845+
| DefKind::ImplTraitPlaceholder
846+
| DefKind::LifetimeParam
847+
| DefKind::GlobalAsm => false,
848+
}
849+
}
850+
851+
fn should_encode_attrs(def_kind: DefKind) -> bool {
852+
match def_kind {
853+
DefKind::Mod
854+
| DefKind::Struct
855+
| DefKind::Union
856+
| DefKind::Enum
857+
| DefKind::Variant
858+
| DefKind::Trait
859+
| DefKind::TyAlias
860+
| DefKind::ForeignTy
861+
| DefKind::TraitAlias
862+
| DefKind::AssocTy
863+
| DefKind::Fn
864+
| DefKind::Const
865+
| DefKind::Static(_)
866+
| DefKind::AssocFn
867+
| DefKind::AssocConst
868+
| DefKind::Macro(_)
869+
| DefKind::Field
870+
| DefKind::Impl { .. } => true,
871+
DefKind::TyParam
872+
| DefKind::ConstParam
873+
| DefKind::Ctor(..)
874+
| DefKind::ExternCrate
875+
| DefKind::Use
876+
| DefKind::ForeignMod
877+
| DefKind::AnonConst
878+
| DefKind::InlineConst
835879
| DefKind::OpaqueTy
836880
| DefKind::ImplTraitPlaceholder
837-
| DefKind::Impl { .. }
881+
| DefKind::LifetimeParam
882+
| DefKind::GlobalAsm
883+
| DefKind::Closure
884+
| DefKind::Generator => false,
885+
}
886+
}
887+
888+
fn should_encode_expn_that_defined(def_kind: DefKind) -> bool {
889+
match def_kind {
890+
DefKind::Mod
891+
| DefKind::Struct
892+
| DefKind::Union
893+
| DefKind::Enum
894+
| DefKind::Variant
895+
| DefKind::Trait
896+
| DefKind::Impl { .. } => true,
897+
DefKind::TyAlias
898+
| DefKind::ForeignTy
899+
| DefKind::TraitAlias
900+
| DefKind::AssocTy
901+
| DefKind::TyParam
902+
| DefKind::Fn
903+
| DefKind::Const
904+
| DefKind::ConstParam
905+
| DefKind::Static(_)
906+
| DefKind::Ctor(..)
907+
| DefKind::AssocFn
908+
| DefKind::AssocConst
909+
| DefKind::Macro(_)
910+
| DefKind::ExternCrate
911+
| DefKind::Use
912+
| DefKind::ForeignMod
913+
| DefKind::AnonConst
914+
| DefKind::InlineConst
915+
| DefKind::OpaqueTy
916+
| DefKind::ImplTraitPlaceholder
917+
| DefKind::Field
918+
| DefKind::LifetimeParam
919+
| DefKind::GlobalAsm
920+
| DefKind::Closure
921+
| DefKind::Generator => false,
922+
}
923+
}
924+
925+
fn should_encode_visibility(def_kind: DefKind) -> bool {
926+
match def_kind {
927+
DefKind::Mod
928+
| DefKind::Struct
929+
| DefKind::Union
930+
| DefKind::Enum
931+
| DefKind::Variant
932+
| DefKind::Trait
933+
| DefKind::TyAlias
934+
| DefKind::ForeignTy
935+
| DefKind::TraitAlias
936+
| DefKind::AssocTy
937+
| DefKind::Fn
938+
| DefKind::Const
939+
| DefKind::Static(..)
940+
| DefKind::Ctor(..)
941+
| DefKind::AssocFn
942+
| DefKind::AssocConst
943+
| DefKind::Macro(..)
838944
| DefKind::Field => true,
839-
DefKind::TyParam
945+
DefKind::Use
946+
| DefKind::ForeignMod
947+
| DefKind::TyParam
840948
| DefKind::ConstParam
841949
| DefKind::LifetimeParam
842950
| DefKind::AnonConst
843951
| DefKind::InlineConst
952+
| DefKind::OpaqueTy
953+
| DefKind::ImplTraitPlaceholder
844954
| DefKind::GlobalAsm
955+
| DefKind::Impl { .. }
845956
| DefKind::Closure
846957
| DefKind::Generator
847958
| DefKind::ExternCrate => false,
@@ -1160,11 +1271,17 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
11601271
let def_kind = tcx.opt_def_kind(local_id);
11611272
let Some(def_kind) = def_kind else { continue };
11621273
self.tables.opt_def_kind.set_some(def_id.index, def_kind);
1163-
let def_span = tcx.def_span(local_id);
1164-
record!(self.tables.def_span[def_id] <- def_span);
1165-
self.encode_attrs(local_id);
1166-
record!(self.tables.expn_that_defined[def_id] <- self.tcx.expn_that_defined(def_id));
1167-
if let Some(ident_span) = tcx.def_ident_span(def_id) {
1274+
if should_encode_span(def_kind) {
1275+
let def_span = tcx.def_span(local_id);
1276+
record!(self.tables.def_span[def_id] <- def_span);
1277+
}
1278+
if should_encode_attrs(def_kind) {
1279+
self.encode_attrs(local_id);
1280+
}
1281+
if should_encode_expn_that_defined(def_kind) {
1282+
record!(self.tables.expn_that_defined[def_id] <- self.tcx.expn_that_defined(def_id));
1283+
}
1284+
if should_encode_span(def_kind) && let Some(ident_span) = tcx.def_ident_span(def_id) {
11681285
record!(self.tables.def_ident_span[def_id] <- ident_span);
11691286
}
11701287
if def_kind.has_codegen_attrs() {

‎src/librustdoc/clean/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ impl Item {
687687
return None;
688688
}
689689
// Variants always inherit visibility
690-
VariantItem(..) => return None,
690+
VariantItem(..) | ImplItem(..) => return None,
691691
// Trait items inherit the trait's visibility
692692
AssocConstItem(..) | TyAssocConstItem(..) | AssocTypeItem(..) | TyAssocTypeItem(..)
693693
| TyMethodItem(..) | MethodItem(..) => {

‎tests/ui/associated-types/associated-types-in-ambiguous-context.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// normalize-stderr-test: "and \d+ other candidates" -> "and N other candidates"
2+
13
trait Get {
24
type Value;
35
fn get(&self) -> <Self as Get>::Value;

‎tests/ui/associated-types/associated-types-in-ambiguous-context.stderr

+14-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0223]: ambiguous associated type
2-
--> $DIR/associated-types-in-ambiguous-context.rs:6:36
2+
--> $DIR/associated-types-in-ambiguous-context.rs:8:36
33
|
44
LL | fn get<T:Get,U:Get>(x: T, y: U) -> Get::Value {}
55
| ^^^^^^^^^^
@@ -10,30 +10,37 @@ LL | fn get<T:Get,U:Get>(x: T, y: U) -> <Example as Get>::Value {}
1010
| ~~~~~~~~~~~~~~~~~~~~~~~
1111

1212
error[E0223]: ambiguous associated type
13-
--> $DIR/associated-types-in-ambiguous-context.rs:20:17
13+
--> $DIR/associated-types-in-ambiguous-context.rs:22:17
1414
|
1515
LL | trait Foo where Foo::Assoc: Bar {
1616
| ^^^^^^^^^^ help: use the fully-qualified path: `<Self as Foo>::Assoc`
1717

1818
error[E0223]: ambiguous associated type
19-
--> $DIR/associated-types-in-ambiguous-context.rs:25:10
19+
--> $DIR/associated-types-in-ambiguous-context.rs:27:10
2020
|
2121
LL | type X = std::ops::Deref::Target;
2222
| ^^^^^^^^^^^^^^^^^^^^^^^
2323
|
24-
help: if there were a type named `Example` that implemented `Deref`, you could use the fully-qualified path
24+
help: use the fully-qualified path
2525
|
26-
LL | type X = <Example as Deref>::Target;
26+
LL | type X = <CString as Deref>::Target;
2727
| ~~~~~~~~~~~~~~~~~~~~~~~~~~
28+
LL | type X = <IoSlice<'_> as Deref>::Target;
29+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
30+
LL | type X = <IoSliceMut<'_> as Deref>::Target;
31+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32+
LL | type X = <OsString as Deref>::Target;
33+
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~
34+
and N other candidates
2835

2936
error[E0223]: ambiguous associated type
30-
--> $DIR/associated-types-in-ambiguous-context.rs:11:23
37+
--> $DIR/associated-types-in-ambiguous-context.rs:13:23
3138
|
3239
LL | fn grab(&self) -> Grab::Value;
3340
| ^^^^^^^^^^^ help: use the fully-qualified path: `<Self as Grab>::Value`
3441

3542
error[E0223]: ambiguous associated type
36-
--> $DIR/associated-types-in-ambiguous-context.rs:14:22
43+
--> $DIR/associated-types-in-ambiguous-context.rs:16:22
3744
|
3845
LL | fn get(&self) -> Get::Value;
3946
| ^^^^^^^^^^

0 commit comments

Comments
 (0)