---

yaml
---
r: 60794
b: refs/heads/auto
c: 4988c89
h: refs/heads/master
v: v3

Author: Aatch

[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: a5b87d71e09889da28510f960a6fd47fca3dcbf9
+refs/heads/auto: 4988c89e86d7120d5c9b0d5ccabba4e8763e1fe7
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/back/passes.rs

@@ -10,9 +10,8 @@
 
 use core::prelude::*;
 
-use driver::session::{Session, Session_, No, Less, Default};
 use driver::session;
-use lib::llvm::{PassRef, ModuleRef,PassManagerRef,ValueRef,TargetDataRef};
+use lib::llvm::{PassRef, ModuleRef,PassManagerRef,TargetDataRef};
 use lib::llvm::llvm;
 use lib;
 
@@ -56,12 +55,12 @@ impl PassManager {
 
 pub fn populatePassManager(pm: &mut PassManager, level:session::OptLevel) {
     unsafe {
-        // We add a lot of potentially-unused prototypes, so strip them right at the
-        // start. We do it again later when we know for certain which ones are used
-        pm.addPass(llvm::LLVMCreateStripDeadPrototypesPass());
-
         if level == session::No {
             pm.addPass(llvm::LLVMCreateAlwaysInlinerPass());
+
+            // We add a lot of unused prototypes, so strip them no matter
+            // what
+            pm.addPass(llvm::LLVMCreateStripDeadPrototypesPass());
             return;
         }