Skip to content

Commit 2b1b9fe

Browse files
authored
Bump LLVM to ace1c838ca91c83c7a271d9378b86ea56051e83f. (#8705)
This is mostly a clean bump, but I did clean up a couple warnings that the fresh compile revealed. The one minor breaking change was a change to argument order in ConstantIntOp::build, which was added in: llvm/llvm-project@a45fda6 This just swaps the order.
1 parent 2beb8e7 commit 2b1b9fe

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

lib/Conversion/SCFToCalyx/SCFToCalyx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1254,7 +1254,7 @@ LogicalResult BuildOpGroups::buildOp(PatternRewriter &rewriter,
12541254
uint64_t signBit = 1ULL << (bitwidth - 1);
12551255
uint64_t absMask = ~signBit & ((1ULL << bitwidth) - 1); // clear sign bit
12561256

1257-
Value maskOp = rewriter.create<arith::ConstantIntOp>(loc, absMask, intTy);
1257+
Value maskOp = rewriter.create<arith::ConstantIntOp>(loc, intTy, absMask);
12581258

12591259
auto combGroup = createGroupForOp<calyx::CombGroupOp>(rewriter, absFOp);
12601260
rewriter.setInsertionPointToStart(combGroup.getBodyBlock());

lib/Dialect/SystemC/SystemCOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ void FuncOp::build(OpBuilder &odsBuilder, OperationState &odsState,
857857
assert(type.getNumInputs() == argAttrs.size());
858858
mlir::call_interface_impl::addArgAndResultAttrs(
859859
odsBuilder, odsState, argAttrs,
860-
/*resultAttrs=*/std::nullopt, FuncOp::getArgAttrsAttrName(odsState.name),
860+
/*resultAttrs=*/{}, FuncOp::getArgAttrsAttrName(odsState.name),
861861
FuncOp::getResAttrsAttrName(odsState.name));
862862
}
863863

llvm

Submodule llvm updated 9483 files

unittests/Dialect/OM/Evaluator/EvaluatorTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ TEST(EvaluatorTests, ListAttrConcat) {
14361436

14371437
auto listVal =
14381438
llvm::cast<evaluator::ListValue>(fieldValue.get())->getElements();
1439-
ASSERT_EQ(4, listVal.size());
1439+
ASSERT_EQ(4UL, listVal.size());
14401440
auto checkEq = [](evaluator::EvaluatorValue *val, const char *str) {
14411441
ASSERT_EQ(str, llvm::cast<evaluator::AttributeValue>(val)
14421442
->getAs<StringAttr>()

0 commit comments

Comments
 (0)