diff options
| author | bors <bors@rust-lang.org> | 2022-07-01 11:09:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-01 11:09:35 +0000 |
| commit | ca1e68b3229e710c3948a361ee770d846a88e6da (patch) | |
| tree | cbd0e8977b42bd32f8ab140f36f825a9d8d74ed6 /compiler/rustc_codegen_llvm/src/common.rs | |
| parent | 7e2733bb1dd9afe5fd20370ca4d539d42ac50419 (diff) | |
| parent | 6e918b4a97c8a2cb0923a639d76f840ac63b76c7 (diff) | |
| download | rust-ca1e68b3229e710c3948a361ee770d846a88e6da.tar.gz rust-ca1e68b3229e710c3948a361ee770d846a88e6da.zip | |
Auto merge of #98730 - matthiaskrgr:rollup-2c4d4x5, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #97629 ([core] add `Exclusive` to sync) - #98503 (fix data race in thread::scope) - #98670 (llvm-wrapper: adapt for LLVMConstExtractValue removal) - #98671 (Fix source sidebar bugs) - #98677 (For diagnostic information of Boolean, remind it as use the type: 'bool') - #98684 (add test for 72793) - #98688 (interpret: add From<&MplaceTy> for PlaceTy) - #98695 (use "or pattern") - #98709 (Remove unneeded methods declaration for old web browsers) - #98717 (get rid of tidy 'unnecessarily ignored' warnings) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/common.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/common.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/common.rs b/compiler/rustc_codegen_llvm/src/common.rs index b69d7a000ee..d37aadeb523 100644 --- a/compiler/rustc_codegen_llvm/src/common.rs +++ b/compiler/rustc_codegen_llvm/src/common.rs @@ -109,8 +109,7 @@ impl<'ll> CodegenCx<'ll, '_> { pub fn const_get_elt(&self, v: &'ll Value, idx: u64) -> &'ll Value { unsafe { assert_eq!(idx as c_uint as u64, idx); - let us = &[idx as c_uint]; - let r = llvm::LLVMConstExtractValue(v, us.as_ptr(), us.len() as c_uint); + let r = llvm::LLVMGetAggregateElement(v, idx as c_uint).unwrap(); debug!("const_get_elt(v={:?}, idx={}, r={:?})", v, idx, r); |