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

Use empty typeck tables when nesting on items without those

Browse Source
This commit is contained in:
Igor Matuszewski 2019-10-05 01:25:20 +02:00
parent 429fc9d7b7
commit 7b3cd1b674
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc_save_analysis/dump_visitor.rs
View File

@ -115,15 +115,17 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
F: FnOnce(&mut Self), F: FnOnce(&mut Self),
{ {
let item_def_id = self.tcx.hir().local_def_id_from_node_id(item_id); let item_def_id = self.tcx.hir().local_def_id_from_node_id(item_id);
if self.tcx.has_typeck_tables(item_def_id) {
let tables = self.tcx.typeck_tables_of(item_def_id); let tables = if self.tcx.has_typeck_tables(item_def_id) {
let old_tables = self.save_ctxt.tables; self.tcx.typeck_tables_of(item_def_id)
self.save_ctxt.tables = tables;
f(self);
self.save_ctxt.tables = old_tables;
} else { } else {
f(self); self.save_ctxt.empty_tables
} };
let old_tables = self.save_ctxt.tables;
self.save_ctxt.tables = tables;
f(self);
self.save_ctxt.tables = old_tables;
} }
fn span_from_span(&self, span: Span) -> SpanData { fn span_from_span(&self, span: Span) -> SpanData {

4
src/librustc_save_analysis/lib.rs
View File

@ -48,6 +48,9 @@ use log::{debug, error, info};
pub struct SaveContext<'l, 'tcx> { pub struct SaveContext<'l, 'tcx> {
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
tables: &'l ty::TypeckTables<'tcx>, tables: &'l ty::TypeckTables<'tcx>,
/// Used as a fallback when nesting the typeck tables during item processing
/// (if these are not available for that item, e.g. don't own a body)
empty_tables: &'l ty::TypeckTables<'tcx>,
access_levels: &'l AccessLevels, access_levels: &'l AccessLevels,
span_utils: SpanUtils<'tcx>, span_utils: SpanUtils<'tcx>,
config: Config, config: Config,
@ -1114,6 +1117,7 @@ pub fn process_crate<'l, 'tcx, H: SaveHandler>(
let save_ctxt = SaveContext { let save_ctxt = SaveContext {
tcx, tcx,
tables: &ty::TypeckTables::empty(None), tables: &ty::TypeckTables::empty(None),
empty_tables: &ty::TypeckTables::empty(None),
access_levels: &access_levels, access_levels: &access_levels,
span_utils: SpanUtils::new(&tcx.sess), span_utils: SpanUtils::new(&tcx.sess),
config: find_config(config), config: find_config(config),