Expand ReturnOp error to include types. NFC.

    Found it a bit easier to see what mismatches occurred when invoking passes doesn't match.

--

PiperOrigin-RevId: 248597286

diff --git a/mlir/lib/StandardOps/Ops.cpp b/mlir/lib/StandardOps/Ops.cpp
index 214d5a9..5d5f403 100644 (file)
--- a/mlir/lib/StandardOps/Ops.cpp
+++ b/mlir/lib/StandardOps/Ops.cpp
@@ -1907,8 +1907,10 @@ static LogicalResult verify(ReturnOp op) {
 
   for (unsigned i = 0, e = results.size(); i != e; ++i)
     if (op.getOperand(i)->getType() != results[i])
-      return op.emitError("type of return operand ")
-             << i << " doesn't match function result type";
+      return op.emitError()
+             << "type of return operand " << i << " ("
+             << op.getOperand(i)->getType()
+             << ") doesn't match function result type (" << results[i] << ")";
 
   return success();
 }

diff --git a/mlir/test/IR/invalid.mlir b/mlir/test/IR/invalid.mlir
index 0fe5029..39e8f27 100644 (file)
--- a/mlir/test/IR/invalid.mlir
+++ b/mlir/test/IR/invalid.mlir
@@ -451,7 +451,7 @@ func @dominance_failure() {
 
 func @return_type_mismatch() -> i32 {
   %0 = "foo"() : ()->f32
-  return %0 : f32  // expected-error {{type of return operand 0 doesn't match function result type}}
+  return %0 : f32  // expected-error {{type of return operand 0 (f32) doesn't match function result type (i32)}}
 }
 
 // -----