Skip to content

Commit

Permalink
Add fn_arg_names table.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjgillot
cjgillot committed Feb 19, 2022
1 parent 6cc96a4 commit 381d32e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 29 deletions.
9 changes: 0 additions & 9 deletions compiler/rustc_metadata/src/rmeta/decoder.rs
View file
Expand Up @@ -1395,15 +1395,6 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
tcx.arena.alloc_from_iter(self.root.lang_items_missing.decode(self))
}

fn get_fn_param_names(self, tcx: TyCtxt<'tcx>, id: DefIndex) -> &'tcx [Ident] {
let param_names = match self.kind(id) {
EntryKind::Fn(data) | EntryKind::ForeignFn(data) => data.decode(self).param_names,
EntryKind::AssocFn(data) => data.decode(self).fn_data.param_names,
_ => Lazy::empty(),
};
LazyQueryDecodable::decode_query(Some(param_names), self, tcx, || unreachable!())
}

fn exported_symbols(
self,
tcx: TyCtxt<'tcx>,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
View file
Expand Up @@ -139,6 +139,7 @@ provide! { <'tcx> tcx, def_id, other, cdata,
mir_const_qualif => { table }
rendered_const => { table }
asyncness => { table }
fn_arg_names => { table }

trait_def => { cdata.get_trait_def(def_id.index, tcx.sess) }
adt_def => { cdata.get_adt_def(def_id.index, tcx) }
Expand All @@ -154,7 +155,6 @@ provide! { <'tcx> tcx, def_id, other, cdata,
static_mutability => { cdata.static_mutability(def_id.index) }
generator_kind => { cdata.generator_kind(def_id.index) }
item_attrs => { tcx.arena.alloc_from_iter(cdata.get_item_attrs(def_id.index, tcx.sess)) }
fn_arg_names => { cdata.get_fn_param_names(tcx, def_id.index) }
trait_of_item => { cdata.get_trait_of_item(def_id.index) }
is_mir_available => { cdata.is_item_mir_available(def_id.index) }
is_ctfe_mir_available => { cdata.is_ctfe_mir_available(def_id.index) }
Expand Down
30 changes: 12 additions & 18 deletions compiler/rustc_metadata/src/rmeta/encoder.rs
View file
Expand Up @@ -1195,12 +1195,16 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
}
ty::AssocKind::Fn => {
let fn_data = if let hir::TraitItemKind::Fn(m_sig, m) = &ast_item.kind {
let param_names = match *m {
hir::TraitFn::Required(ref names) => self.encode_fn_param_names(names),
hir::TraitFn::Provided(body) => self.encode_fn_param_names_for_body(body),
match *m {
hir::TraitFn::Required(ref names) => {
record!(self.tables.fn_arg_names[def_id] <- *names)
}
hir::TraitFn::Provided(body) => {
record!(self.tables.fn_arg_names[def_id] <- self.tcx.hir().body_param_names(body))
}
};
record!(self.tables.asyncness[def_id] <- m_sig.header.asyncness);
FnData { constness: hir::Constness::NotConst, param_names }
FnData { constness: hir::Constness::NotConst }
} else {
bug!()
};
Expand Down Expand Up @@ -1262,14 +1266,14 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
ty::AssocKind::Fn => {
let fn_data = if let hir::ImplItemKind::Fn(ref sig, body) = ast_item.kind {
record!(self.tables.asyncness[def_id] <- sig.header.asyncness);
record!(self.tables.fn_arg_names[def_id] <- self.tcx.hir().body_param_names(body));
FnData {
// Can be inside `impl const Trait`, so using sig.header.constness is not reliable
constness: if self.tcx.is_const_fn_raw(def_id) {
hir::Constness::Const
} else {
hir::Constness::NotConst
},
param_names: self.encode_fn_param_names_for_body(body),
}
} else {
bug!()
Expand All @@ -1294,14 +1298,6 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
}
}

fn encode_fn_param_names_for_body(&mut self, body_id: hir::BodyId) -> Lazy<[Ident]> {
self.lazy(self.tcx.hir().body_param_names(body_id))
}

fn encode_fn_param_names(&mut self, param_names: &[Ident]) -> Lazy<[Ident]> {
self.lazy(param_names.iter())
}

fn encode_mir(&mut self) {
if self.is_proc_macro {
return;
Expand Down Expand Up @@ -1405,10 +1401,8 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
}
hir::ItemKind::Fn(ref sig, .., body) => {
record!(self.tables.asyncness[def_id] <- sig.header.asyncness);
let data = FnData {
constness: sig.header.constness,
param_names: self.encode_fn_param_names_for_body(body),
};
record!(self.tables.fn_arg_names[def_id] <- self.tcx.hir().body_param_names(body));
let data = FnData { constness: sig.header.constness };

EntryKind::Fn(self.lazy(data))
}
Expand Down Expand Up @@ -1874,13 +1868,13 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
match nitem.kind {
hir::ForeignItemKind::Fn(_, ref names, _) => {
record!(self.tables.asyncness[def_id] <- hir::IsAsync::NotAsync);
record!(self.tables.fn_arg_names[def_id] <- *names);
let data = FnData {
constness: if self.tcx.is_const_fn_raw(def_id) {
hir::Constness::Const
} else {
hir::Constness::NotConst
},
param_names: self.encode_fn_param_names(names),
};
record!(self.tables.kind[def_id] <- EntryKind::ForeignFn(self.lazy(data)));
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_metadata/src/rmeta/mod.rs
View file
Expand Up @@ -311,6 +311,7 @@ define_tables! {
mir_const_qualif: Table<DefIndex, Lazy!(mir::ConstQualifs)>,
rendered_const: Table<DefIndex, Lazy!(String)>,
asyncness: Table<DefIndex, Lazy!(hir::IsAsync)>,
fn_arg_names: Table<DefIndex, Lazy!([Ident])>,

trait_item_def_id: Table<DefIndex, Lazy<DefId>>,
inherent_impls: Table<DefIndex, Lazy<[DefIndex]>>,
Expand Down Expand Up @@ -363,7 +364,6 @@ enum EntryKind {
#[derive(MetadataEncodable, MetadataDecodable)]
struct FnData {
constness: hir::Constness,
param_names: Lazy<[Ident]>,
}

#[derive(TyEncodable, TyDecodable)]
Expand Down

0 comments on commit 381d32e

Please sign in to comment.