---

yaml
---
r: 96981
b: refs/heads/dist-snap
c: 02bdda2
h: refs/heads/master
i:
  96979: 6a6b305
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: b895ba52bc4b5e7f6887327f3918b4abeb8430cb
+refs/heads/dist-snap: 02bdda27763bcb5d3038d6abd7b1c50d2c394a1c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/trans/base.rs

@@ -507,10 +507,11 @@ pub fn set_no_split_stack(f: ValueRef) {
 // Double-check that we never ask LLVM to declare the same symbol twice. It
 // silently mangles such symbols, breaking our linkage model.
 pub fn note_unique_llvm_symbol(ccx: &mut CrateContext, sym: @str) {
-    if ccx.all_llvm_symbols.contains(&sym) {
+    let mut all_llvm_symbols = ccx.all_llvm_symbols.borrow_mut();
+    if all_llvm_symbols.get().contains(&sym) {
         ccx.sess.bug(~"duplicate LLVM symbol: " + sym);
     }
-    ccx.all_llvm_symbols.insert(sym);
+    all_llvm_symbols.get().insert(sym);
 }
 
 

branches/dist-snap/src/librustc/middle/trans/context.rs

@@ -97,7 +97,7 @@ pub struct CrateContext {
      adt_reprs: RefCell<HashMap<ty::t, @adt::Repr>>,
      symbol_hasher: Sha256,
      type_hashcodes: RefCell<HashMap<ty::t, @str>>,
-     all_llvm_symbols: HashSet<@str>,
+     all_llvm_symbols: RefCell<HashSet<@str>>,
      tcx: ty::ctxt,
      maps: astencode::Maps,
      stats: @mut Stats,
@@ -207,7 +207,7 @@ impl CrateContext {
                   adt_reprs: RefCell::new(HashMap::new()),
                   symbol_hasher: symbol_hasher,
                   type_hashcodes: RefCell::new(HashMap::new()),
-                  all_llvm_symbols: HashSet::new(),
+                  all_llvm_symbols: RefCell::new(HashSet::new()),
                   tcx: tcx,
                   maps: maps,
                   stats: @mut Stats {