From 071bf09676afc644fe702474b95efe5dd9795f60 Mon Sep 17 00:00:00 2001 From: AmrDeveloper Date: Wed, 23 Apr 2025 20:15:05 +0200 Subject: [PATCH 1/2] [CIR] Backport replacing removed getFixedVectorType with vectortype get --- clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp index 0a0dc2de0b44..51b156c99b61 100644 --- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp +++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp @@ -4421,7 +4421,7 @@ void prepareTypeConverter(mlir::LLVMTypeConverter &converter, }); converter.addConversion([&](cir::VectorType type) -> mlir::Type { auto ty = converter.convertType(type.getEltType()); - return mlir::LLVM::getFixedVectorType(ty, type.getSize()); + return mlir::VectorType::get(type.getSize(), ty); }); converter.addConversion([&](cir::BoolType type) -> mlir::Type { return mlir::IntegerType::get(type.getContext(), 1, From 18eabb22057ac26fb431b23d2f60c7cca80931f0 Mon Sep 17 00:00:00 2001 From: AmrDeveloper Date: Wed, 30 Apr 2025 06:49:47 +0200 Subject: [PATCH 2/2] Fix merge conflict --- clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp index b2f671751edd..788c3844295b 100644 --- a/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp +++ b/clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp @@ -4447,7 +4447,7 @@ void prepareTypeConverter(mlir::LLVMTypeConverter &converter, return mlir::LLVM::LLVMArrayType::get(ty, type.getSize()); }); converter.addConversion([&](cir::VectorType type) -> mlir::Type { - auto ty = converter.convertType(type.getEltType()); + auto ty = converter.convertType(type.getElementType()); return mlir::VectorType::get(type.getSize(), ty); }); converter.addConversion([&](cir::BoolType type) -> mlir::Type {