Skip to content

[mlir] Fix build after #175815 #176332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthias-springer merged 1 commit into from
Jan 16, 2026
Merged

[mlir] Fix build after #175815 #176332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions clang/lib/CIR/Dialect/IR/CIRDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,8 @@ void cir::IfOp::getSuccessorRegions(mlir::RegionBranchPoint point,
}

mlir::ValueRange cir::IfOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void cir::IfOp::build(OpBuilder &builder, OperationState &result, Value cond,
Expand Down Expand Up @@ -1231,7 +1232,8 @@ void cir::ScopeOp::getSuccessorRegions(
}

mlir::ValueRange cir::ScopeOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void cir::ScopeOp::build(
Expand Down Expand Up @@ -1398,7 +1400,8 @@ void cir::CaseOp::getSuccessorRegions(
}

mlir::ValueRange cir::CaseOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void cir::CaseOp::build(OpBuilder &builder, OperationState &result,
Expand Down Expand Up @@ -1429,7 +1432,8 @@ void cir::SwitchOp::getSuccessorRegions(
}

mlir::ValueRange cir::SwitchOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void cir::SwitchOp::build(OpBuilder &builder, OperationState &result,
Expand Down Expand Up @@ -1661,7 +1665,8 @@ void cir::GlobalOp::getSuccessorRegions(
}

mlir::ValueRange cir::GlobalOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

static void printGlobalOpTypeAndInitialValue(OpAsmPrinter &p, cir::GlobalOp op,
Expand Down Expand Up @@ -2339,7 +2344,8 @@ void cir::TernaryOp::getSuccessorRegions(
}

mlir::ValueRange cir::TernaryOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void cir::TernaryOp::build(
Expand Down Expand Up @@ -3576,7 +3582,8 @@ void cir::TryOp::getSuccessorRegions(
}

mlir::ValueRange cir::TryOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

static void
Expand Down
3 changes: 2 additions & 1 deletion mlir/lib/Dialect/EmitC/IR/EmitC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,8 @@ void IfOp::getSuccessorRegions(RegionBranchPoint point,
}

ValueRange IfOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void IfOp::getEntrySuccessorRegions(ArrayRef<Attribute> operands,
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Dialect/GPU/IR/GPUDialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@ void WarpExecuteOnLane0Op::getSuccessorRegions(
}

ValueRange WarpExecuteOnLane0Op::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getResults() : ValueRange();
return successor.isParent() ? ValueRange(getResults()) : ValueRange();
}
void WarpExecuteOnLane0Op::build(OpBuilder &builder, OperationState &result,
TypeRange resultTypes, Value laneId,
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void AllocaScopeOp::getSuccessorRegions(
}

ValueRange AllocaScopeOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getResults() : ValueRange();
return successor.isParent() ? ValueRange(getResults()) : ValueRange();
}

/// Given an operation, return whether this op is guaranteed to
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Dialect/OpenACC/IR/OpenACC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ getSingleRegionOpSuccessorRegions(Operation *op, Region &region,

static ValueRange getSingleRegionSuccessorInputs(Operation *op,
RegionSuccessor successor) {
return successor.isParent() ? op->getResults() : ValueRange();
return successor.isParent() ? ValueRange(op->getResults()) : ValueRange();
}

void KernelsOp::getSuccessorRegions(RegionBranchPoint point,
Expand Down
9 changes: 6 additions & 3 deletions mlir/lib/Dialect/SCF/IR/SCF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,8 @@ void ExecuteRegionOp::getSuccessorRegions(
}

ValueRange ExecuteRegionOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

//===----------------------------------------------------------------------===//
Expand Down Expand Up @@ -2137,7 +2138,8 @@ void IfOp::getSuccessorRegions(RegionBranchPoint point,
}

ValueRange IfOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void IfOp::getEntrySuccessorRegions(ArrayRef<Attribute> operands,
Expand Down Expand Up @@ -3875,7 +3877,8 @@ void IndexSwitchOp::getSuccessorRegions(
}

ValueRange IndexSwitchOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void IndexSwitchOp::getEntrySuccessorRegions(
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Dialect/Shape/IR/Shape.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ void AssumingOp::getSuccessorRegions(
}

ValueRange AssumingOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getResults() : ValueRange();
return successor.isParent() ? ValueRange(getResults()) : ValueRange();
}

void AssumingOp::inlineRegionIntoParent(AssumingOp &op,
Expand Down
3 changes: 2 additions & 1 deletion mlir/lib/Dialect/Transform/TuneExtension/TuneExtensionOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ void transform::tune::AlternativesOp::getSuccessorRegions(

ValueRange
transform::tune::AlternativesOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

void transform::tune::AlternativesOp::getRegionInvocationBounds(
Expand Down
2 changes: 1 addition & 1 deletion mlir/test/lib/Dialect/Test/TestOpDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ void AnyCondOp::getSuccessorRegions(RegionBranchPoint point,
}

ValueRange AnyCondOp::getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getResults() : ValueRange();
return successor.isParent() ? ValueRange(getResults()) : ValueRange();
}

void AnyCondOp::getRegionInvocationBounds(
Expand Down
6 changes: 4 additions & 2 deletions mlir/unittests/Interfaces/ControlFlowInterfacesTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ struct LoopRegionsOp
}

ValueRange getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

using RegionBranchOpInterface::Trait<LoopRegionsOp>::getSuccessorRegions;
Expand Down Expand Up @@ -101,7 +102,8 @@ struct DoubleLoopRegionsOp
}

ValueRange getSuccessorInputs(RegionSuccessor successor) {
return successor.isParent() ? getOperation()->getResults() : ValueRange();
return successor.isParent() ? ValueRange(getOperation()->getResults())
: ValueRange();
}

using RegionBranchOpInterface::Trait<
Expand Down
Loading