OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use Symbol/InternedString in the cache

Browse Source
This commit is contained in:
Niko Matsakis 2017-04-21 17:26:25 -04:00
parent f4c183b742
commit 85527456e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/librustc_trans/symbol_cache.rs
View File

@ -8,9 +8,9 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
use std::cell::RefCell;
use std::rc::Rc;
use rustc::ty::TyCtxt; use rustc::ty::TyCtxt;
use std::cell::RefCell;
use syntax_pos::symbol::{InternedString, Symbol};
use trans_item::TransItem; use trans_item::TransItem;
use util::nodemap::FxHashMap; use util::nodemap::FxHashMap;
@ -22,7 +22,7 @@ use util::nodemap::FxHashMap;
pub struct SymbolCache<'a, 'tcx: 'a> { pub struct SymbolCache<'a, 'tcx: 'a> {
tcx: TyCtxt<'a, 'tcx, 'tcx>, tcx: TyCtxt<'a, 'tcx, 'tcx>,
index: RefCell<FxHashMap<TransItem<'tcx>, Rc<String>>>, index: RefCell<FxHashMap<TransItem<'tcx>, Symbol>>,
} }
impl<'a, 'tcx> SymbolCache<'a, 'tcx> { impl<'a, 'tcx> SymbolCache<'a, 'tcx> {
@ -33,10 +33,10 @@ impl<'a, 'tcx> SymbolCache<'a, 'tcx> {
} }
} }
pub fn get(&self, trans_item: TransItem<'tcx>) -> Rc<String> { pub fn get(&self, trans_item: TransItem<'tcx>) -> InternedString {
let mut index = self.index.borrow_mut(); let mut index = self.index.borrow_mut();
index.entry(trans_item) index.entry(trans_item)
.or_insert_with(|| Rc::new(trans_item.compute_symbol_name(self.tcx))) .or_insert_with(|| Symbol::intern(&trans_item.compute_symbol_name(self.tcx)))
.clone() .as_str()
} }
} }