librustc: Make ty::mk_ctxt take an unwrapped DefMap (no RefCell)

Author: gereeter

src/librustc/middle/ty.rs

@@ -2589,7 +2589,7 @@ impl<'tcx> CommonTypes<'tcx> {
 
 pub fn mk_ctxt<'tcx>(s: Session,
                      arenas: &'tcx CtxtArenas<'tcx>,
-                     def_map: RefCell<DefMap>,
+                     def_map: DefMap,
                      named_region_map: resolve_lifetime::NamedRegionMap,
                      map: ast_map::Map<'tcx>,
                      freevars: RefCell<FreevarMap>,
@@ -2611,7 +2611,7 @@ pub fn mk_ctxt<'tcx>(s: Session,
         item_variance_map: RefCell::new(DefIdMap()),
         variance_computed: Cell::new(false),
         sess: s,
-        def_map: def_map,
+        def_map: RefCell::new(def_map),
         region_maps: region_maps,
         node_types: RefCell::new(FnvHashMap()),
         item_substs: RefCell::new(NodeMap()),

src/librustc_driver/driver.rs

@@ -622,7 +622,7 @@ pub fn phase_3_run_analysis_passes<'tcx>(sess: Session,
 
     let ty_cx = ty::mk_ctxt(sess,
                             arenas,
-                            def_map,
+                            def_map.into_inner(),
                             named_region_map,
                             ast_map,
                             freevars,

src/librustc_driver/test.rs

@@ -129,7 +129,7 @@ fn test_env<F>(source_string: &str,
     let region_map = region::resolve_crate(&sess, krate);
     let tcx = ty::mk_ctxt(sess,
                           &arenas,
-                          def_map,
+                          def_map.into_inner(),
                           named_region_map,
                           ast_map,
                           freevars,