auto merge of #9976 : thestinger/rust/typo, r=thestinger

This commit is contained in:
bors 2013-10-20 21:11:19 -07:00
commit cd59a7c464

View File

@ -297,7 +297,7 @@ pub fn run_passes(sess: Session,
if !sess.no_prepopulate_passes() {
llvm::LLVMRustAddAnalysisPasses(tm, fpm, llmod);
llvm::LLVMRustAddAnalysisPasses(tm, mpm, llmod);
populate_llvm_passess(fpm, mpm, llmod, OptLevel);
populate_llvm_passes(fpm, mpm, llmod, OptLevel);
}
for pass in sess.opts.custom_passes.iter() {
@ -422,10 +422,10 @@ unsafe fn configure_llvm(sess: Session) {
}
}
unsafe fn populate_llvm_passess(fpm: lib::llvm::PassManagerRef,
mpm: lib::llvm::PassManagerRef,
llmod: ModuleRef,
opt: lib::llvm::CodeGenOptLevel) {
unsafe fn populate_llvm_passes(fpm: lib::llvm::PassManagerRef,
mpm: lib::llvm::PassManagerRef,
llmod: ModuleRef,
opt: lib::llvm::CodeGenOptLevel) {
// Create the PassManagerBuilder for LLVM. We configure it with
// reasonable defaults and prepare it to actually populate the pass
// manager.