From 435d832c5d86bf2ffff02457e4ae7edbe30cfc34 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Wed, 31 Oct 2018 11:56:11 +1300 Subject: [PATCH] save analysis: don't dump macro refs --- src/librustc_save_analysis/dump_visitor.rs | 26 ++++++++++++---------- src/librustc_save_analysis/json_dumper.rs | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs index 839b8956b4c..9bc3fbe7c24 100644 --- a/src/librustc_save_analysis/dump_visitor.rs +++ b/src/librustc_save_analysis/dump_visitor.rs @@ -92,7 +92,7 @@ pub struct DumpVisitor<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> { // we only write one macro def per unique macro definition, and // one macro use per unique callsite span. // mac_defs: FxHashSet, - macro_calls: FxHashSet, + // macro_calls: FxHashSet, } impl<'l, 'tcx: 'l, 'll, O: DumpOutput + 'll> DumpVisitor<'l, 'tcx, 'll, O> { @@ -108,7 +108,7 @@ pub fn new( span: span_utils, cur_scope: CRATE_NODE_ID, // mac_defs: FxHashSet::default(), - macro_calls: FxHashSet::default(), + // macro_calls: FxHashSet::default(), } } @@ -1030,18 +1030,20 @@ fn process_var_decl(&mut self, p: &'l ast::Pat, value: String) { /// If the span is not macro-generated, do nothing, else use callee and /// callsite spans to record macro definition and use data, using the /// mac_uses and mac_defs sets to prevent multiples. - fn process_macro_use(&mut self, span: Span) { - let source_span = span.source_callsite(); - if !self.macro_calls.insert(source_span) { - return; - } + fn process_macro_use(&mut self, _span: Span) { + // FIXME if we're not dumping the defs (see below), there is no point + // dumping refs either. + // let source_span = span.source_callsite(); + // if !self.macro_calls.insert(source_span) { + // return; + // } - let data = match self.save_ctxt.get_macro_use_data(span) { - None => return, - Some(data) => data, - }; + // let data = match self.save_ctxt.get_macro_use_data(span) { + // None => return, + // Some(data) => data, + // }; - self.dumper.macro_use(data); + // self.dumper.macro_use(data); // FIXME write the macro def // let mut hasher = DefaultHasher::new(); diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs index e14ac73ee10..d2354f38e26 100644 --- a/src/librustc_save_analysis/json_dumper.rs +++ b/src/librustc_save_analysis/json_dumper.rs @@ -93,7 +93,7 @@ pub fn compilation_opts(&mut self, data: CompilationOptions) { self.result.compilation = Some(data); } - pub fn macro_use(&mut self, data: MacroRef) { + pub fn _macro_use(&mut self, data: MacroRef) { if self.config.pub_only || self.config.reachable_only { return; } -- 2.44.0