From 0f95e73190c9a555c2917a2963eab128c4ba5395 Mon Sep 17 00:00:00 2001 From: Alex Zinenko Date: Wed, 19 Aug 2020 18:46:53 +0200 Subject: [PATCH] [mlir] fix build after llvm made ElementCount constructor private The original patch (264afb9e6aebc98c353644dd0700bec808501cab) did not update subprojects. --- mlir/lib/Dialect/LLVMIR/IR/LLVMTypes.cpp | 2 +- mlir/lib/Target/LLVMIR/ModuleTranslation.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMTypes.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMTypes.cpp index 727efbb..18008c61 100644 --- a/mlir/lib/Dialect/LLVMIR/IR/LLVMTypes.cpp +++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMTypes.cpp @@ -483,7 +483,7 @@ LLVMType LLVMVectorType::getElementType() { llvm::ElementCount LLVMVectorType::getElementCount() { // Both derived classes share the implementation type. - return llvm::ElementCount( + return llvm::ElementCount::get( static_cast(impl)->numElements, isa()); } diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp index 21f5201..093a9e6 100644 --- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp +++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp @@ -141,7 +141,7 @@ llvm::Constant *ModuleTranslation::getLLVMConstant(llvm::Type *llvmType, return nullptr; if (llvmType->isVectorTy()) return llvm::ConstantVector::getSplat( - llvm::ElementCount(numElements, /*Scalable=*/false), child); + llvm::ElementCount::get(numElements, /*Scalable=*/false), child); if (llvmType->isArrayTy()) { auto *arrayType = llvm::ArrayType::get(elementType, numElements); SmallVector constants(numElements, child); -- 2.7.4