[FTBFS] [llvm trunk] error: no matching function for call to ‘m_c_ICmp(llvm

[LW-archlinux]

spirv-llvm-translator rev b8b1b96 fails to build against llvm trunk rev 865260840441 .

Building against rev ab0dc290bca1 works fine.

/build/spirv-llvm-translator-minimal-git/src/SPIRV-LLVM-Translator/lib/SPIRV/OCLToSPIRV.cpp: In function ‘bool SPIRV::{anonymous}::usesSpvExtImageRaw10Raw12Constants(const llvm::CallInst*)’:
/build/spirv-llvm-translator-minimal-git/src/SPIRV-LLVM-Translator/lib/SPIRV/OCLToSPIRV.cpp:1435:28: error: no matching function for call to ‘m_c_ICmp(llvm::CmpInst::Predicate&, llvm::PatternMatch::class_match<llvm::Value>, llvm::PatternMatch::specific_intval64<false>)’
 1435 |       if (match(U, m_c_ICmp(Pred, m_Value(), m_SpecificInt(C)))) {
      |                    ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /build/spirv-llvm-translator-minimal-git/src/SPIRV-LLVM-Translator/lib/SPIRV/OCLToSPIRV.cpp:50:
/usr/include/llvm/IR/PatternMatch.h:2737:1: note: candidate: ‘template<class LHS, class RHS> llvm::PatternMatch::CmpClass_match<LHS, RHS, llvm::ICmpInst, true> llvm::PatternMatch::m_c_ICmp(llvm::CmpPredicate&, const LHS&, const RHS&)’
 2737 | m_c_ICmp(CmpPredicate &Pred, const LHS &L, const RHS &R) {
      | ^~~~~~~~
/usr/include/llvm/IR/PatternMatch.h:2737:1: note:   template argument deduction/substitution failed:
/build/spirv-llvm-translator-minimal-git/src/SPIRV-LLVM-Translator/lib/SPIRV/OCLToSPIRV.cpp:1435:29: note:   cannot convert ‘Pred’ (type ‘llvm::CmpInst::Predicate’) to type ‘llvm::CmpPredicate&’
 1435 |       if (match(U, m_c_ICmp(Pred, m_Value(), m_SpecificInt(C)))) {
      |                             ^~~~
/usr/include/llvm/IR/PatternMatch.h:2742:49: note: candidate: ‘template<class LHS, class RHS> llvm::PatternMatch::CmpClass_match<LHS, RHS, llvm::ICmpInst, true> llvm::PatternMatch::m_c_ICmp(const LHS&, const RHS&)’
 2742 | inline CmpClass_match<LHS, RHS, ICmpInst, true> m_c_ICmp(const LHS &L,
      |                                                 ^~~~~~~~
/usr/include/llvm/IR/PatternMatch.h:2742:49: note:   candidate expects 2 arguments, 3 provided

spirv-llvm-translator-minimal-git-1:r2191.b8b1b96-1-x86_64-build.log

[svenvh]

Should be fixed now that #2928 is merged, but please re-open if the problem persists.