---

yaml
---
r: 69438
b: refs/heads/auto
c: 075560a
h: refs/heads/master
v: v3

Author: dotdash

[refs]

@@ -14,6 +14,6 @@ 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: 293ec2c5820e8b5dc4394e2c11ad3d2e9cfb56eb
+refs/heads/auto: 075560a9f2f715ac0e599a13d26d1a910be36509
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/driver/driver.rs

@@ -409,12 +409,19 @@ pub fn stop_after_phase_5(sess: Session) -> bool {
 pub fn compile_input(sess: Session, cfg: ast::CrateConfig, input: &input,
                      outdir: &Option<Path>, output: &Option<Path>) {
     let outputs = build_output_filenames(input, outdir, output, [], sess);
-    let crate = phase_1_parse_input(sess, cfg.clone(), input);
-    if stop_after_phase_1(sess) { return; }
-    let expanded_crate = phase_2_configure_and_expand(sess, cfg, crate);
-    let analysis = phase_3_run_analysis_passes(sess, expanded_crate);
-    if stop_after_phase_3(sess) { return; }
-    let trans = phase_4_translate_to_llvm(sess, expanded_crate, &analysis, outputs);
+    // We need nested scopes here, because the intermediate results can keep
+    // large chunks of memory alive and we want to free them as soon as
+    // possible to keep the peak memory usage low
+    let trans = {
+        let expanded_crate = {
+            let crate = phase_1_parse_input(sess, cfg.clone(), input);
+            if stop_after_phase_1(sess) { return; }
+            phase_2_configure_and_expand(sess, cfg, crate)
+        };
+        let analysis = phase_3_run_analysis_passes(sess, expanded_crate);
+        if stop_after_phase_3(sess) { return; }
+        phase_4_translate_to_llvm(sess, expanded_crate, &analysis, outputs)
+    };
     phase_5_run_llvm_passes(sess, &trans, outputs);
     if stop_after_phase_5(sess) { return; }
     phase_6_link_output(sess, &trans, outputs);