Build LLVM wrap getDeclaration by version

Niram7777 · Niram7777 · commit 18963da9a54f · 2025-12-04T20:20:08.000+01:00
diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h
@@ -1149,7 +1149,11 @@ struct llvm_fshl
 	static llvm::Function* get_fshl(llvm::IRBuilder<>* ir)
 	{
 		const auto _module = ir->GetInsertBlock()->getParent()->getParent();
+#if LLVM_VERSION_MAJOR >= 21 || (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)
 		return llvm::Intrinsic::getOrInsertDeclaration(_module, llvm::Intrinsic::fshl, {llvm_value_t<T>::get_type(ir->getContext())});
+#else
+		return llvm::Intrinsic::getDeclaration(_module, llvm::Intrinsic::fshl, {llvm_value_t<T>::get_type(ir->getContext())});
+#endif
 	}
 
 	static llvm::Value* fold(llvm::IRBuilder<>* ir, llvm::Value* v1, llvm::Value* v2, llvm::Value* v3)
@@ -1221,7 +1225,11 @@ struct llvm_fshr
 	static llvm::Function* get_fshr(llvm::IRBuilder<>* ir)
 	{
 		const auto _module = ir->GetInsertBlock()->getParent()->getParent();
+#if LLVM_VERSION_MAJOR >= 21 || (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)
 		return llvm::Intrinsic::getOrInsertDeclaration(_module, llvm::Intrinsic::fshr, {llvm_value_t<T>::get_type(ir->getContext())});
+#else
+		return llvm::Intrinsic::getDeclaration(_module, llvm::Intrinsic::fshr, {llvm_value_t<T>::get_type(ir->getContext())});
+#endif
 	}
 
 	static llvm::Value* fold(llvm::IRBuilder<>* ir, llvm::Value* v1, llvm::Value* v2, llvm::Value* v3)
@@ -2220,7 +2228,11 @@ struct llvm_add_sat
 	static llvm::Function* get_add_sat(llvm::IRBuilder<>* ir)
 	{
 		const auto _module = ir->GetInsertBlock()->getParent()->getParent();
+#if LLVM_VERSION_MAJOR >= 21 || (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)
 		return llvm::Intrinsic::getOrInsertDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});
+#else
+		return llvm::Intrinsic::getDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});
+#endif
 	}
 
 	llvm::Value* eval(llvm::IRBuilder<>* ir) const
@@ -2303,7 +2315,11 @@ struct llvm_sub_sat
 	static llvm::Function* get_sub_sat(llvm::IRBuilder<>* ir)
 	{
 		const auto _module = ir->GetInsertBlock()->getParent()->getParent();
+#if LLVM_VERSION_MAJOR >= 21 || (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)
 		return llvm::Intrinsic::getOrInsertDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});
+#else
+		return llvm::Intrinsic::getDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});
+#endif
 	}
 
 	llvm::Value* eval(llvm::IRBuilder<>* ir) const
@@ -3592,7 +3608,11 @@ class cpu_translator
 	llvm::Function* get_intrinsic(llvm::Intrinsic::ID id)
 	{
 		const auto _module = m_ir->GetInsertBlock()->getParent()->getParent();
+#if LLVM_VERSION_MAJOR >= 21 || (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)
 		return llvm::Intrinsic::getOrInsertDeclaration(_module, id, {get_type<Types>()...});
+#else
+		return llvm::Intrinsic::getDeclaration(_module, id, {get_type<Types>()...});
+#endif
 	}
 
 	template <typename T1, typename T2>

Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,11 @@ struct llvm_fshl`
`1149`	`1149`	`static llvm::Function* get_fshl(llvm::IRBuilder<>* ir)`
`1150`	`1150`	`{`
`1151`	`1151`	`const auto _module = ir->GetInsertBlock()->getParent()->getParent();`
	`1152`	`+#if LLVM_VERSION_MAJOR >= 21 \|\| (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)`
`1152`	`1153`	`return llvm::Intrinsic::getOrInsertDeclaration(_module, llvm::Intrinsic::fshl, {llvm_value_t<T>::get_type(ir->getContext())});`
	`1154`	`+#else`
	`1155`	`+ return llvm::Intrinsic::getDeclaration(_module, llvm::Intrinsic::fshl, {llvm_value_t<T>::get_type(ir->getContext())});`
	`1156`	`+#endif`
`1153`	`1157`	`}`
`1154`	`1158`
`1155`	`1159`	`static llvm::Value* fold(llvm::IRBuilder<>* ir, llvm::Value* v1, llvm::Value* v2, llvm::Value* v3)`
`@@ -1221,7 +1225,11 @@ struct llvm_fshr`
`1221`	`1225`	`static llvm::Function* get_fshr(llvm::IRBuilder<>* ir)`
`1222`	`1226`	`{`
`1223`	`1227`	`const auto _module = ir->GetInsertBlock()->getParent()->getParent();`
	`1228`	`+#if LLVM_VERSION_MAJOR >= 21 \|\| (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)`
`1224`	`1229`	`return llvm::Intrinsic::getOrInsertDeclaration(_module, llvm::Intrinsic::fshr, {llvm_value_t<T>::get_type(ir->getContext())});`
	`1230`	`+#else`
	`1231`	`+ return llvm::Intrinsic::getDeclaration(_module, llvm::Intrinsic::fshr, {llvm_value_t<T>::get_type(ir->getContext())});`
	`1232`	`+#endif`
`1225`	`1233`	`}`
`1226`	`1234`
`1227`	`1235`	`static llvm::Value* fold(llvm::IRBuilder<>* ir, llvm::Value* v1, llvm::Value* v2, llvm::Value* v3)`
`@@ -2220,7 +2228,11 @@ struct llvm_add_sat`
`2220`	`2228`	`static llvm::Function* get_add_sat(llvm::IRBuilder<>* ir)`
`2221`	`2229`	`{`
`2222`	`2230`	`const auto _module = ir->GetInsertBlock()->getParent()->getParent();`
	`2231`	`+#if LLVM_VERSION_MAJOR >= 21 \|\| (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)`
`2223`	`2232`	`return llvm::Intrinsic::getOrInsertDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});`
	`2233`	`+#else`
	`2234`	`+ return llvm::Intrinsic::getDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});`
	`2235`	`+#endif`
`2224`	`2236`	`}`
`2225`	`2237`
`2226`	`2238`	`llvm::Value* eval(llvm::IRBuilder<>* ir) const`
`@@ -2303,7 +2315,11 @@ struct llvm_sub_sat`
`2303`	`2315`	`static llvm::Function* get_sub_sat(llvm::IRBuilder<>* ir)`
`2304`	`2316`	`{`
`2305`	`2317`	`const auto _module = ir->GetInsertBlock()->getParent()->getParent();`
	`2318`	`+#if LLVM_VERSION_MAJOR >= 21 \|\| (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)`
`2306`	`2319`	`return llvm::Intrinsic::getOrInsertDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});`
	`2320`	`+#else`
	`2321`	`+ return llvm::Intrinsic::getDeclaration(_module, intr, {llvm_value_t<T>::get_type(ir->getContext())});`
	`2322`	`+#endif`
`2307`	`2323`	`}`
`2308`	`2324`
`2309`	`2325`	`llvm::Value* eval(llvm::IRBuilder<>* ir) const`
`@@ -3592,7 +3608,11 @@ class cpu_translator`
`3592`	`3608`	`llvm::Function* get_intrinsic(llvm::Intrinsic::ID id)`
`3593`	`3609`	`{`
`3594`	`3610`	`const auto _module = m_ir->GetInsertBlock()->getParent()->getParent();`
	`3611`	`+#if LLVM_VERSION_MAJOR >= 21 \|\| (LLVM_VERSION_MAJOR == 20 && LLVM_VERSION_MINOR >= 1)`
`3595`	`3612`	`return llvm::Intrinsic::getOrInsertDeclaration(_module, id, {get_type<Types>()...});`
	`3613`	`+#else`
	`3614`	`+ return llvm::Intrinsic::getDeclaration(_module, id, {get_type<Types>()...});`
	`3615`	`+#endif`
`3596`	`3616`	`}`
`3597`	`3617`
`3598`	`3618`	`template <typename T1, typename T2>`