---

yaml
---
r: 64767
b: refs/heads/snap-stage3
c: 413446c
h: refs/heads/master
i:
  64765: 7cd1e7f
  64763: 5469f59
  64759: 05aa6d2
  64751: 50279f6
  64735: c71b195
  64703: 77d2f1c
  64639: f6daf75
  64511: 73dd451
v: v3

Author: graydon

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8d654fc41d0c69eaaa78409e8d42318a478b7c83
+refs/heads/snap-stage3: 413446c85b44a7d9269a0723ed043e16d09e2324
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/driver/driver.rs

@@ -43,6 +43,7 @@ pub mod doc;
 
 pub mod check_loans;
 
+#[path="gather_loans/mod.rs"]
 pub mod gather_loans;
 
 pub mod move_data;

branches/snap-stage3/src/librustc/middle/borrowck/mod.rs

@@ -28,15 +28,15 @@ use back::link::{mangle_exported_name};
 use back::{link, abi};
 use driver::session;
 use driver::session::Session;
-use lib::llvm::{ContextRef, ModuleRef, ValueRef, BasicBlockRef};
+use driver::driver::{CrateAnalysis, CrateTranslation};
+use lib::llvm::{ModuleRef, ValueRef, BasicBlockRef};
 use lib::llvm::{llvm, True};
 use lib;
 use metadata::common::LinkMeta;
 use metadata::{csearch, cstore, encoder};
 use middle::astencode;
 use middle::lang_items::{LangItem, ExchangeMallocFnLangItem, StartFnLangItem};
 use middle::lang_items::{MallocFnLangItem, ClosureExchangeMallocFnLangItem};
-use middle::resolve;
 use middle::trans::_match;
 use middle::trans::adt;
 use middle::trans::base;
@@ -66,7 +66,7 @@ use util::ppaux::{Repr, ty_to_str};
 use middle::trans::type_::Type;
 
 use std::hash;
-use std::hashmap::{HashMap, HashSet};
+use std::hashmap::HashMap;
 use std::io;
 use std::libc::c_uint;
 use std::uint;
@@ -2957,12 +2957,8 @@ pub fn write_abi_version(ccx: &mut CrateContext) {
 
 pub fn trans_crate(sess: session::Session,
                    crate: &ast::Crate,
-                   tcx: ty::ctxt,
-                   output: &Path,
-                   emap2: resolve::ExportMap2,
-                   reachable_map: @mut HashSet<ast::node_id>,
-                   maps: astencode::Maps)
-                   -> (ContextRef, ModuleRef, LinkMeta) {
+                   analysis: &CrateAnalysis,
+                   output: &Path) -> CrateTranslation {
     // Before we touch LLVM, make sure that multithreading is enabled.
     if unsafe { !llvm::LLVMRustStartMultithreading() } {
         //sess.bug("couldn't enable multi-threaded LLVM");
@@ -2983,12 +2979,12 @@ pub fn trans_crate(sess: session::Session,
 
     let ccx = @mut CrateContext::new(sess,
                                      llmod_id,
-                                     tcx,
-                                     emap2,
-                                     maps,
+                                     analysis.ty_cx,
+                                     analysis.exp_map2,
+                                     analysis.maps,
                                      symbol_hasher,
                                      link_meta,
-                                     reachable_map);
+                                     analysis.reachable);
 
     {
         let _icx = push_ctxt("data");
@@ -3043,5 +3039,9 @@ pub fn trans_crate(sess: session::Session,
     let link_meta = ccx.link_meta;
     let llmod = ccx.llmod;
 
-    return (llcx, llmod, link_meta);
+    return CrateTranslation {
+        context: llcx,
+        module: llmod,
+        link: link_meta
+    };
 }

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

@@ -52,6 +52,7 @@ pub mod combine;
 pub mod glb;
 pub mod lattice;
 pub mod lub;
+#[path = "region_inference/mod.rs"]
 pub mod region_inference;
 pub mod resolve;
 pub mod sub;

branches/snap-stage3/src/librustc/middle/typeck/infer/mod.rs

@@ -66,9 +66,11 @@ use syntax::print::pprust::*;
 use syntax::{ast, ast_map, abi};
 use syntax::opt_vec;
 
+#[path = "check/mod.rs"]
 pub mod check;
 pub mod rscope;
 pub mod astconv;
+#[path = "infer/mod.rs"]
 pub mod infer;
 pub mod collect;
 pub mod coherence;

branches/snap-stage3/src/librustc/middle/typeck/mod.rs

@@ -41,15 +41,18 @@ use syntax::codemap;
 use syntax::diagnostic;
 
 pub mod middle {
+    #[path = "trans/mod.rs"]
     pub mod trans;
     pub mod ty;
     pub mod subst;
     pub mod resolve;
+    #[path = "typeck/mod.rs"]
     pub mod typeck;
     pub mod check_loop;
     pub mod check_match;
     pub mod check_const;
     pub mod lint;
+    #[path = "borrowck/mod.rs"]
     pub mod borrowck;
     pub mod dataflow;
     pub mod mem_categorization;
@@ -67,6 +70,7 @@ pub mod middle {
     pub mod effect;
     pub mod reachable;
     pub mod graph;
+    #[path = "cfg/mod.rs"]
     pub mod cfg;
 }
 
@@ -89,8 +93,10 @@ pub mod back {
     pub mod passes;
 }
 
+#[path = "metadata/mod.rs"]
 pub mod metadata;
 
+#[path = "driver/mod.rs"]
 pub mod driver;
 
 pub mod util {

branches/snap-stage3/src/librustc/rustc.rs

@@ -223,13 +223,15 @@ fn run(mut program: ~Program, binary: ~str, lib_search_paths: ~[~str],
     debug!("testing with ^^^^^^ %?", (||{ println(test) })());
     let dinput = driver::str_input(test.to_managed());
     let cfg = driver::build_configuration(sess, binary, &dinput);
-    let outputs = driver::build_output_filenames(&dinput, &None, &None, [], sess);
-    let (crate, tcx) = driver::compile_upto(sess, cfg.clone(), &dinput,
-                                            driver::cu_typeck, Some(outputs));
+
+    let crate = driver::phase_1_parse_input(sess, cfg.clone(), &dinput);
+    let expanded_crate = driver::phase_2_configure_and_expand(sess, cfg, crate);
+    let analysis = driver::phase_3_run_analysis_passes(sess, expanded_crate);
+
     // Once we're typechecked, record the types of all local variables defined
     // in this input
-    do find_main(crate.expect("crate after cu_typeck"), sess) |blk| {
-        program.register_new_vars(blk, tcx.expect("tcx after cu_typeck"));
+    do find_main(crate, sess) |blk| {
+        program.register_new_vars(blk, analysis.ty_cx);
     }
 
     //
@@ -242,8 +244,12 @@ fn run(mut program: ~Program, binary: ~str, lib_search_paths: ~[~str],
     let cfg = driver::build_configuration(sess, binary, &input);
     let outputs = driver::build_output_filenames(&input, &None, &None, [], sess);
     let sess = driver::build_session(options, diagnostic::emit);
-    driver::compile_upto(sess, cfg, &input, driver::cu_everything,
-                         Some(outputs));
+
+    let crate = driver::phase_1_parse_input(sess, cfg.clone(), &input);
+    let expanded_crate = driver::phase_2_configure_and_expand(sess, cfg, crate);
+    let analysis = driver::phase_3_run_analysis_passes(sess, expanded_crate);
+    let trans = driver::phase_4_translate_to_llvm(sess, expanded_crate, &analysis, outputs);
+    driver::phase_5_run_llvm_passes(sess, &trans, outputs);
 
     //
     // Stage 4: Inform the program that computation is done so it can update all
@@ -265,10 +271,7 @@ fn run(mut program: ~Program, binary: ~str, lib_search_paths: ~[~str],
         let code = fmt!("fn main() {\n %s \n}", input);
         let input = driver::str_input(code.to_managed());
         let cfg = driver::build_configuration(sess, binary, &input);
-        let outputs = driver::build_output_filenames(&input, &None, &None, [], sess);
-        let (crate, _) = driver::compile_upto(sess, cfg, &input,
-                                              driver::cu_parse, Some(outputs));
-        crate.expect("parsing should return a crate")
+        driver::phase_1_parse_input(sess, cfg.clone(), &input)
     }
 
     fn find_main(crate: @ast::Crate, sess: session::Session,
@@ -334,9 +337,12 @@ fn compile_crate(src_filename: ~str, binary: ~str) -> Option<bool> {
             None => { },
         }
         if (should_compile) {
-            printfln!("compiling %s...", src_filename);
-            driver::compile_upto(sess, cfg, &input, driver::cu_everything,
-                                 Some(outputs));
+            println(fmt!("compiling %s...", src_filename));
+            let crate = driver::phase_1_parse_input(sess, cfg.clone(), &input);
+            let expanded_crate = driver::phase_2_configure_and_expand(sess, cfg, crate);
+            let analysis = driver::phase_3_run_analysis_passes(sess, expanded_crate);
+            let trans = driver::phase_4_translate_to_llvm(sess, expanded_crate, &analysis, outputs);
+            driver::phase_5_run_llvm_passes(sess, &trans, outputs);
             true
         } else { false }
     } {

branches/snap-stage3/src/librusti/rusti.rs

@@ -109,7 +109,8 @@ impl<'self> PkgScript<'self> {
         let input = driver::file_input(script);
         let sess = driver::build_session(options, diagnostic::emit);
         let cfg = driver::build_configuration(sess, binary, &input);
-        let (crate, _) = driver::compile_upto(sess, cfg.clone(), &input, driver::cu_parse, None);
+        let crate = driver::phase_1_parse_input(sess, cfg.clone(), &input);
+        let crate = driver::phase_2_configure_and_expand(sess, cfg.clone(), crate);
         let work_dir = build_pkg_id_in_workspace(id, workspace);
 
         debug!("Returning package script with id %?", id);
@@ -119,7 +120,7 @@ impl<'self> PkgScript<'self> {
             input: input,
             sess: sess,
             cfg: cfg,
-            crate: crate.unwrap(),
+            crate: crate,
             build_dir: work_dir
         }
     }
@@ -142,14 +143,10 @@ impl<'self> PkgScript<'self> {
                 let root = r.pop().pop().pop().pop(); // :-\
                 debug!("Root is %s, calling compile_rest", root.to_str());
                 let exe = self.build_dir.push(~"pkg" + util::exe_suffix());
-                let binary = os::args()[0].to_managed();
                 util::compile_crate_from_input(&self.input,
                                                &self.build_dir,
                                                sess,
-                                               crate,
-                                               driver::build_configuration(sess,
-                                                                           binary, &self.input),
-                                               driver::cu_parse);
+                                               crate);
                 debug!("Running program: %s %s %s %s", exe.to_str(),
                        sysroot.to_str(), root.to_str(), "install");
                 // FIXME #7401 should support commands besides `install`

branches/snap-stage3/src/librustpkg/rustpkg.rs

@@ -18,7 +18,6 @@ use syntax::ext::base::ExtCtxt;
 use syntax::{ast, attr, codemap, diagnostic, fold};
 use syntax::attr::AttrMetaMethods;
 use rustc::back::link::output_type_exe;
-use rustc::driver::driver::compile_upto;
 use rustc::driver::session::{lib_crate, bin_crate};
 use context::Ctx;
 use package_id::PkgId;
@@ -220,12 +219,8 @@ pub fn compile_input(ctxt: &Ctx,
     // Infer dependencies that rustpkg needs to build, by scanning for
     // `extern mod` directives.
     let cfg = driver::build_configuration(sess, binary, &input);
-    let (crate_opt, _) = driver::compile_upto(sess, cfg.clone(), &input, driver::cu_expand, None);
-
-    let mut crate = match crate_opt {
-        Some(c) => c,
-        None => fail!("compile_input expected...")
-    };
+    let mut crate = driver::phase_1_parse_input(sess, cfg.clone(), &input);
+    crate = driver::phase_2_configure_and_expand(sess, cfg, crate);
 
     // Not really right. Should search other workspaces too, and the installed
     // database (which doesn't exist yet)
@@ -257,7 +252,7 @@ pub fn compile_input(ctxt: &Ctx,
 
     debug!("calling compile_crate_from_input, out_dir = %s,
            building_library = %?", out_dir.to_str(), sess.building_library);
-    compile_crate_from_input(&input, out_dir, sess, crate, cfg.clone(), driver::cu_expand);
+    compile_crate_from_input(&input, out_dir, sess, crate);
     true
 }
 
@@ -269,9 +264,7 @@ pub fn compile_input(ctxt: &Ctx,
 pub fn compile_crate_from_input(input: &driver::input,
                                 build_dir: &Path,
                                 sess: session::Session,
-                                crate: @ast::Crate,
-                                cfg: ast::CrateConfig,
-                                compile_from: driver::compile_phase) {
+                                crate: @ast::Crate) {
     debug!("Calling build_output_filenames with %s, building library? %?",
            build_dir.to_str(), sess.building_library);
 
@@ -284,15 +277,13 @@ pub fn compile_crate_from_input(input: &driver::input,
     for sess.opts.addl_lib_search_paths.iter().advance |lib| {
         debug!("an additional library: %s", lib.to_str());
     }
-
-    driver::compile_rest(sess,
-                         cfg,
-                         compile_upto {
-                             from: compile_from,
-                             to: driver::cu_everything
-                         },
-                         Some(outputs),
-                         Some(crate));
+    let analysis = driver::phase_3_run_analysis_passes(sess, crate);
+    let translation = driver::phase_4_translate_to_llvm(sess, crate,
+                                                        &analysis,
+                                                        outputs);
+    driver::phase_5_run_llvm_passes(sess, &translation, outputs);
+    if driver::stop_after_phase_5(sess) { return; }
+    driver::phase_6_link_output(sess, &translation, outputs);
 }
 
 #[cfg(windows)]

branches/snap-stage3/src/librustpkg/util.rs

@@ -90,12 +90,14 @@ mod kill;
 mod sched;
 
 /// Synchronous I/O.
+#[path = "io/mod.rs"]
 pub mod io;
 
 /// The EventLoop and internal synchronous I/O interface.
 mod rtio;
 
 /// libuv and default rtio implementation.
+#[path = "uv/mod.rs"]
 pub mod uv;
 
 /// The Local trait for types that are accessible via thread-local

branches/snap-stage3/src/libstd/rt/mod.rs

@@ -162,6 +162,7 @@ pub mod trie;
 
 /* Tasks and communication */
 
+#[path = "task/mod.rs"]
 pub mod task;
 pub mod comm;
 pub mod pipes;
@@ -189,6 +190,7 @@ pub mod util;
 /* Unsupported interfaces */
 
 // Private APIs
+#[path = "unstable/mod.rs"]
 pub mod unstable;
 
 /* For internal use, not exported */
@@ -200,6 +202,7 @@ mod stackwalk;
 
 // XXX: This shouldn't be pub, and it should be reexported under 'unstable'
 // but name resolution doesn't work without it being pub.
+#[path = "rt/mod.rs"]
 pub mod rt;
 
 // A curious inner-module that's not exported that contains the binding

branches/snap-stage3/src/libstd/std.rs

@@ -45,6 +45,7 @@ pub mod visit;
 pub mod fold;
 
 
+#[path = "parse/mod.rs"]
 pub mod parse;
 
 pub mod print {
@@ -59,6 +60,7 @@ pub mod ext {
 
     pub mod quote;
 
+    #[path = "deriving/mod.rs"]
     pub mod deriving;
 
     pub mod build;
@@ -78,6 +80,7 @@ pub mod ext {
     pub mod auto_encode;
     pub mod source_util;
 
+    #[path = "pipes/mod.rs"]
     pub mod pipes;
 
     pub mod trace_macros;