librustc Eagerly compute and bind some data to accommodate by-value closures.

Author: pcwalton

src/librustc/back/link.rs

@@ -429,6 +429,8 @@ pub mod write {
             }
         }
 
+        let llvm_args_len = llvm_args.len();
+        let llvm_args_ptr = llvm_args.as_ptr();
         INIT.doit(|| {
             llvm::LLVMInitializePasses();
 
@@ -454,8 +456,8 @@ pub mod write {
             llvm::LLVMInitializeMipsAsmPrinter();
             llvm::LLVMInitializeMipsAsmParser();
 
-            llvm::LLVMRustSetLLVMOptions(llvm_args.len() as c_int,
-                                         llvm_args.as_ptr());
+            llvm::LLVMRustSetLLVMOptions(llvm_args_len as c_int,
+                                         llvm_args_ptr);
         });
     }
 

src/librustc/middle/resolve.rs

@@ -1880,15 +1880,17 @@ impl<'a> Resolver<'a> {
             Some(def_id) => def_id,
         };
 
+        let new_module = module.clone();
         csearch::each_child_of_item(&self.session.cstore,
                                     def_id,
                                     |def_like, child_ident, visibility| {
             debug!("(populating external module) ... found ident: {}",
                    token::get_ident(child_ident));
-            self.build_reduced_graph_for_external_crate_def(module.clone(),
-                                                            def_like,
-                                                            child_ident,
-                                                            visibility)
+            self.build_reduced_graph_for_external_crate_def(
+                new_module.clone(),
+                def_like,
+                child_ident,
+                visibility)
         });
         module.populated.set(true)
     }