Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Discard MTWT & interner tables from TLD after they stop being useful. #12770

Merged
merged 1 commit into from Mar 19, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/librustc/driver/driver.rs
Expand Up @@ -305,6 +305,9 @@ pub fn phase_3_run_analysis_passes(sess: Session,
time(time_passes, "resolution", (), |_|
middle::resolve::resolve_crate(&sess, lang_items, krate));

// Discard MTWT tables that aren't required past resolution.
syntax::ext::mtwt::clear_tables();

let named_region_map = time(time_passes, "lifetime resolution", (),
|_| middle::resolve_lifetime::krate(&sess, krate));

Expand Down Expand Up @@ -585,6 +588,10 @@ pub fn compile_input(sess: Session, cfg: ast::CrateConfig, input: &Input,
if stop_after_phase_3(&analysis.ty_cx.sess) { return; }
let (tcx, trans) = phase_4_translate_to_llvm(expanded_crate,
analysis, &outputs);

// Discard interned strings as they are no longer required.
token::get_ident_interner().clear();

(outputs, trans, tcx.sess)
};
phase_5_run_llvm_passes(&sess, &trans, &outputs);
Expand Down
9 changes: 9 additions & 0 deletions src/libsyntax/ext/mtwt.rs
Expand Up @@ -126,6 +126,15 @@ pub fn display_sctable(table: &SCTable) {
}
}

/// Clear the tables from TLD to reclaim memory.
pub fn clear_tables() {
with_sctable(|table| {
*table.table.borrow_mut().get() = Vec::new();
*table.mark_memo.borrow_mut().get() = HashMap::new();
*table.rename_memo.borrow_mut().get() = HashMap::new();
});
with_resolve_table_mut(|table| *table = HashMap::new());
}

// Add a value to the end of a vec, return its index
fn idx_push<T>(vec: &mut Vec<T> , val: T) -> u32 {
Expand Down
10 changes: 10 additions & 0 deletions src/libsyntax/util/interner.rs
Expand Up @@ -84,6 +84,11 @@ impl<T:Eq + Hash + Freeze + Clone + 'static> Interner<T> {
None => None,
}
}

pub fn clear(&self) {
*self.map.borrow_mut().get() = HashMap::new();
*self.vect.borrow_mut().get() = Vec::new();
}
}

#[deriving(Clone, Eq, Hash, Ord)]
Expand Down Expand Up @@ -222,6 +227,11 @@ impl StrInterner {
None => None,
}
}

pub fn clear(&self) {
*self.map.borrow_mut().get() = HashMap::new();
*self.vect.borrow_mut().get() = Vec::new();
}
}

#[cfg(test)]
Expand Down