---

yaml
---
r: 92771
b: refs/heads/auto
c: 7f816b7
h: refs/heads/master
i:
  92769: 0a89028
  92767: 24978ff
v: v3

Author: pcwalton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 8c703643ad0bb1c70c249dc16b5a32e253815be1
+refs/heads/auto: 7f816b7ef4c617eec3d03397f4013c06c9f98ce2
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/check_const.rs

@@ -15,6 +15,7 @@ use middle::ty;
 use middle::typeck;
 use util::ppaux;
 
+use std::cell::RefCell;
 use syntax::ast::*;
 use syntax::codemap;
 use syntax::{ast_util, ast_map};
@@ -215,7 +216,7 @@ struct env {
     sess: Session,
     ast_map: ast_map::map,
     def_map: resolve::DefMap,
-    idstack: @mut ~[NodeId]
+    idstack: @RefCell<~[NodeId]>,
 }
 
 struct CheckItemRecursionVisitor {
@@ -233,7 +234,7 @@ pub fn check_item_recursion(sess: Session,
         sess: sess,
         ast_map: ast_map,
         def_map: def_map,
-        idstack: @mut ~[]
+        idstack: @RefCell::new(~[]),
     };
 
     let mut visitor = CheckItemRecursionVisitor { env: env };
@@ -242,12 +243,19 @@ pub fn check_item_recursion(sess: Session,
 
 impl Visitor<()> for CheckItemRecursionVisitor {
     fn visit_item(&mut self, it: @item, _: ()) {
-        if self.env.idstack.iter().any(|x| x == &(it.id)) {
-            self.env.sess.span_fatal(self.env.root_it.span, "recursive constant");
+        {
+            let mut idstack = self.env.idstack.borrow_mut();
+            if idstack.get().iter().any(|x| x == &(it.id)) {
+                self.env.sess.span_fatal(self.env.root_it.span,
+                                         "recursive constant");
+            }
+            idstack.get().push(it.id);
         }
-        self.env.idstack.push(it.id);
         visit::walk_item(self, it, ());
-        self.env.idstack.pop();
+        {
+            let mut idstack = self.env.idstack.borrow_mut();
+            idstack.get().pop();
+        }
     }
 
     fn visit_expr(&mut self, e: @Expr, _: ()) {