llvm-wrapper: adapt for LLVMConstExtractValue removal

rust-lang · Jun 30, 2022 · a3a88c7 · a3a88c7
1 parent a9eb9c5
commit a3a88c7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git 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);
 

diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs
@@ -1134,11 +1134,7 @@ extern "C" {
  pub fn LLVMConstIntToPtr<'a>(ConstantVal: &'a Value, ToType: &'a Type) -> &'a Value;
  pub fn LLVMConstBitCast<'a>(ConstantVal: &'a Value, ToType: &'a Type) -> &'a Value;
  pub fn LLVMConstPointerCast<'a>(ConstantVal: &'a Value, ToType: &'a Type) -> &'a Value;
- pub fn LLVMConstExtractValue(
- AggConstant: &Value,
- IdxList: *const c_uint,
- NumIdx: c_uint,
- ) -> &Value;
+ pub fn LLVMGetAggregateElement(ConstantVal: &Value, Idx: c_uint) -> Option<&Value>;
 
  // Operations on global variables, functions, and aliases (globals)
  pub fn LLVMIsDeclaration(Global: &Value) -> Bool;

diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
@@ -1865,3 +1865,11 @@ extern "C" void LLVMRustGetMangledName(LLVMValueRef V, RustStringRef Str) {
  GlobalValue *GV = unwrap<GlobalValue>(V);
  Mangler().getNameWithPrefix(OS, GV, true);
 }
+
+// LLVMGetAggregateElement was added in LLVM 15. For earlier LLVM versions just
+// use its implementation.
+#if LLVM_VERSION_LT(15, 0)
+extern "C" LLVMValueRef LLVMGetAggregateElement(LLVMValueRef C, unsigned Idx) {
+ return wrap(unwrap<Constant>(C)->getAggregateElement(Idx));
+}
+#endif