diff options
| author | bors <bors@rust-lang.org> | 2021-04-05 11:06:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-05 11:06:20 +0000 |
| commit | 39eee173fbcc21462d255b364b87715cd33b62db (patch) | |
| tree | e930e86d52114de16148de08b917c974cb874669 /compiler/rustc_codegen_llvm/src | |
| parent | 58e71896506edb701f276158bd2f47e8788a1133 (diff) | |
| parent | 3ca197e89c9affc76e79f0421e1bb9d65a8ec855 (diff) | |
| download | rust-39eee173fbcc21462d255b364b87715cd33b62db.tar.gz rust-39eee173fbcc21462d255b364b87715cd33b62db.zip | |
Auto merge of #83880 - Dylan-DPC:rollup-hz9ph0e, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #81922 (Let `#[allow(unstable_name_collisions)]` work for things other than function) - #82483 (Use FromStr trait for number option parsing) - #82739 (Use the beta compiler for building bootstrap tools when `download-rustc` is set) - #83650 (Update Source Serif to release 4.004) - #83826 (List trait impls before deref methods in doc's sidebar) - #83831 (Add `#[inline]` to IpAddr methods) - #83863 (Render destructured struct function param names as underscore) - #83865 (Don't report disambiguator error if link would have been ignored) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 82f3ee07c93..b628ae3ae3a 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -1047,7 +1047,7 @@ pub unsafe fn with_llvm_pmb( // thresholds copied from clang. match (opt_level, opt_size, inline_threshold) { (.., Some(t)) => { - llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, t as u32); + llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, t); } (llvm::CodeGenOptLevel::Aggressive, ..) => { llvm::LLVMPassManagerBuilderUseInlinerWithThreshold(builder, 275); |