diff options
| author | bors <bors@rust-lang.org> | 2021-11-26 16:30:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-26 16:30:42 +0000 |
| commit | 6d246f0c8d3063fea86abbb65a824362709541ba (patch) | |
| tree | 89367aa9a510b1c1dec9bd2151cf00c9182222f9 /compiler/rustc_codegen_llvm/src | |
| parent | 454cc5fb86be180b3ec1138b6f2b480fbf3f1388 (diff) | |
| parent | a9710deebcfc0d24ea7b3510c9afa6afb40d2ae1 (diff) | |
| download | rust-6d246f0c8d3063fea86abbb65a824362709541ba.tar.gz rust-6d246f0c8d3063fea86abbb65a824362709541ba.zip | |
Auto merge of #91253 - matthiaskrgr:rollup-dnlcjmr, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #91169 (Change cg_ssa's get_param to borrow the builder mutably) - #91176 (If the thread does not get the lock in the short term, yield the CPU) - #91212 (Fix ICE due to out-of-bounds statement index when reporting borrowck error) - #91225 (Fix invalid scrollbar display on source code page) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/abi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs index bedd3523d89..07adfff0901 100644 --- a/compiler/rustc_codegen_llvm/src/abi.rs +++ b/compiler/rustc_codegen_llvm/src/abi.rs @@ -607,7 +607,7 @@ impl AbiBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> { fn_abi.apply_attrs_callsite(self, callsite) } - fn get_param(&self, index: usize) -> Self::Value { + fn get_param(&mut self, index: usize) -> Self::Value { llvm::get_param(self.llfn(), index as c_uint) } } |