Skip to content

Commit 8924a9f

Browse files
author
Simon Camphausen
authored
[mlir][EmitC] Remove unreachable code and fix Windows build warning (#80677)
1 parent 7f292b8 commit 8924a9f

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

mlir/lib/Target/Cpp/TranslateToCpp.cpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ inline LogicalResult interleaveCommaWithError(const Container &c,
6969

7070
/// Return the precedence of a operator as an integer, higher values
7171
/// imply higher precedence.
72-
static int getOperatorPrecedence(Operation *operation) {
73-
return llvm::TypeSwitch<Operation *, int>(operation)
72+
static FailureOr<int> getOperatorPrecedence(Operation *operation) {
73+
return llvm::TypeSwitch<Operation *, FailureOr<int>>(operation)
7474
.Case<emitc::AddOp>([&](auto op) { return 11; })
7575
.Case<emitc::ApplyOp>([&](auto op) { return 13; })
7676
.Case<emitc::CastOp>([&](auto op) { return 13; })
77-
.Case<emitc::CmpOp>([&](auto op) {
77+
.Case<emitc::CmpOp>([&](auto op) -> FailureOr<int> {
7878
switch (op.getPredicate()) {
7979
case emitc::CmpPredicate::eq:
8080
case emitc::CmpPredicate::ne:
@@ -87,13 +87,14 @@ static int getOperatorPrecedence(Operation *operation) {
8787
case emitc::CmpPredicate::three_way:
8888
return 10;
8989
}
90+
return op->emitError("unsupported cmp predicate");
9091
})
9192
.Case<emitc::DivOp>([&](auto op) { return 12; })
9293
.Case<emitc::MulOp>([&](auto op) { return 12; })
9394
.Case<emitc::RemOp>([&](auto op) { return 12; })
9495
.Case<emitc::SubOp>([&](auto op) { return 11; })
95-
.Case<emitc::CallOpaqueOp>([&](auto op) { return 14; });
96-
llvm_unreachable("Unsupported operator");
96+
.Case<emitc::CallOpaqueOp>([&](auto op) { return 14; })
97+
.Default([](auto op) { return op->emitError("unsupported operation"); });
9798
}
9899

99100
namespace {
@@ -1120,7 +1121,10 @@ LogicalResult CppEmitter::emitExpression(ExpressionOp expressionOp) {
11201121
Operation *rootOp = expressionOp.getRootOp();
11211122

11221123
emittedExpression = expressionOp;
1123-
pushExpressionPrecedence(getOperatorPrecedence(rootOp));
1124+
FailureOr<int> precedence = getOperatorPrecedence(rootOp);
1125+
if (failed(precedence))
1126+
return failure();
1127+
pushExpressionPrecedence(precedence.value());
11241128

11251129
if (failed(emitOperation(*rootOp, /*trailingSemicolon=*/false)))
11261130
return failure();
@@ -1137,13 +1141,15 @@ LogicalResult CppEmitter::emitOperand(Value value) {
11371141
if (isPartOfCurrentExpression(value)) {
11381142
Operation *def = value.getDefiningOp();
11391143
assert(def && "Expected operand to be defined by an operation");
1140-
int precedence = getOperatorPrecedence(def);
1141-
bool encloseInParenthesis = precedence < getExpressionPrecedence();
1144+
FailureOr<int> precedence = getOperatorPrecedence(def);
1145+
if (failed(precedence))
1146+
return failure();
1147+
bool encloseInParenthesis = precedence.value() < getExpressionPrecedence();
11421148
if (encloseInParenthesis) {
11431149
os << "(";
11441150
pushExpressionPrecedence(lowestPrecedence());
11451151
} else
1146-
pushExpressionPrecedence(precedence);
1152+
pushExpressionPrecedence(precedence.value());
11471153

11481154
if (failed(emitOperation(*def, /*trailingSemicolon=*/false)))
11491155
return failure();

0 commit comments

Comments
 (0)