---

yaml
---
r: 147931
b: refs/heads/try2
c: 4d6dde7
h: refs/heads/master
i:
  147929: 94373cf
  147927: 2e67187
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: be17a1b08c17b3381e86e3bea828a63ab69e67a9
+refs/heads/try2: 4d6dde7f49eea0031a7faa651edef0a231dcb081
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ast.rs

@@ -89,9 +89,9 @@ pub type SyntaxContext = u32;
 // it should cut down on memory use *a lot*; applying a mark
 // to a tree containing 50 identifiers would otherwise generate
 pub struct SCTable {
-    table : RefCell<~[SyntaxContext_]>,
-    mark_memo : HashMap<(SyntaxContext,Mrk),SyntaxContext>,
-    rename_memo : HashMap<(SyntaxContext,Ident,Name),SyntaxContext>
+    table: RefCell<~[SyntaxContext_]>,
+    mark_memo: RefCell<HashMap<(SyntaxContext,Mrk),SyntaxContext>>,
+    rename_memo: HashMap<(SyntaxContext,Ident,Name),SyntaxContext>
 }
 
 // NB: these must be placed in any SCTable...

branches/try2/src/libsyntax/ast_util.rs

@@ -717,17 +717,18 @@ pub fn new_mark_internal(m:Mrk, tail:SyntaxContext,table:&mut SCTable)
     // flow-sensitivity. Results in two lookups on a hash table hit.
     // also applies to new_rename_internal, below.
     // let try_lookup = table.mark_memo.find(&key);
-    match table.mark_memo.contains_key(&key) {
+    let mut mark_memo = table.mark_memo.borrow_mut();
+    match mark_memo.get().contains_key(&key) {
         false => {
             let new_idx = {
                 let mut table = table.table.borrow_mut();
                 idx_push(table.get(), Mark(m,tail))
             };
-            table.mark_memo.insert(key,new_idx);
+            mark_memo.get().insert(key,new_idx);
             new_idx
         }
         true => {
-            match table.mark_memo.find(&key) {
+            match mark_memo.get().find(&key) {
                 None => fail!("internal error: key disappeared 2013042901"),
                 Some(idxptr) => {*idxptr}
             }
@@ -771,7 +772,7 @@ pub fn new_rename_internal(id:Ident, to:Name, tail:SyntaxContext, table: &mut SC
 pub fn new_sctable_internal() -> SCTable {
     SCTable {
         table: RefCell::new(~[EmptyCtxt,IllegalCtxt]),
-        mark_memo: HashMap::new(),
+        mark_memo: RefCell::new(HashMap::new()),
         rename_memo: HashMap::new()
     }
 }