diff options
| author | bors <bors@rust-lang.org> | 2023-07-11 02:48:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-11 02:48:49 +0000 |
| commit | fcaf04e715bf74ddcbba4c6b0f9adfa00bae1af6 (patch) | |
| tree | bdc40515e5f5535080c9f4620e29c22848fe2dae /compiler/rustc_codegen_llvm/src | |
| parent | 1d4f5affbdee00c816f961c227c6b28a3e725ce6 (diff) | |
| parent | ad4f303a5df3b1caa29ea685d1ffe680960ba4e0 (diff) | |
| download | rust-fcaf04e715bf74ddcbba4c6b0f9adfa00bae1af6.tar.gz rust-fcaf04e715bf74ddcbba4c6b0f9adfa00bae1af6.zip | |
Auto merge of #113559 - matthiaskrgr:rollup-jrqyctc, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #113386 (style-guide: Expand example of combinable expressions to include arrays) - #113523 (Reuse LLVMConstInBoundsGEP2) - #113528 (Dynamically size sigaltstk in rustc) - #113543 (Remove `rustc_llvm` from llvm-stamp nags) - #113548 (Update books) - #113551 (bootstrap: Don't print "Skipping" twice) - #113556 (Don't use serde-derive in the rls shim) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/common.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_llvm/src/common.rs b/compiler/rustc_codegen_llvm/src/common.rs index a2db59bd6c4..4d879fbdcb7 100644 --- a/compiler/rustc_codegen_llvm/src/common.rs +++ b/compiler/rustc_codegen_llvm/src/common.rs @@ -290,7 +290,7 @@ impl<'ll, 'tcx> ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> { } }; let llval = unsafe { - llvm::LLVMRustConstInBoundsGEP2( + llvm::LLVMConstInBoundsGEP2( self.type_i8(), self.const_bitcast(base_addr, self.type_i8p_ext(base_addr_space)), &self.const_usize(offset.bytes()), @@ -320,7 +320,7 @@ impl<'ll, 'tcx> ConstMethods<'tcx> for CodegenCx<'ll, 'tcx> { fn const_ptr_byte_offset(&self, base_addr: Self::Value, offset: abi::Size) -> Self::Value { unsafe { - llvm::LLVMRustConstInBoundsGEP2( + llvm::LLVMConstInBoundsGEP2( self.type_i8(), self.const_bitcast(base_addr, self.type_i8p()), &self.const_usize(offset.bytes()), diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index 3ad546b61e9..e1dfc1b2dd6 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -1155,7 +1155,7 @@ extern "C" { pub fn LLVMConstVector(ScalarConstantVals: *const &Value, Size: c_uint) -> &Value; // Constant expressions - pub fn LLVMRustConstInBoundsGEP2<'a>( + pub fn LLVMConstInBoundsGEP2<'a>( ty: &'a Type, ConstantVal: &'a Value, ConstantIndices: *const &'a Value, |