hl: Improve reporting when type verification of CondOp fails.

Jezurko · lkorenc · commit 6ea6a0161399 · 2023-03-31T12:21:12.000+02:00
diff --git a/lib/vast/Dialect/HighLevel/HighLevelOps.cpp b/lib/vast/Dialect/HighLevel/HighLevelOps.cpp
@@ -307,7 +307,13 @@ namespace vast::hl
     {
         auto then_type = get_yielded_type(getThenRegion());
         auto else_type = get_yielded_type(getElseRegion());
-        return mlir::success(areTypesCompatible(then_type, else_type));
+        bool compatible = typesMatch(then_type, else_type);
+        if (!compatible)
+        {
+            VAST_REPORT("Failed to verify that return types {0}, {1} in CondOp regions match. See location {2}",
+                then_type, else_type, getLoc());
+        }
+        return mlir::success(compatible);
     }
 
     void WhileOp::build(Builder &bld, State &st, BuilderCallback cond, BuilderCallback body)

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,13 @@ namespace vast::hl`
`307`	`307`	`{`
`308`	`308`	`auto then_type = get_yielded_type(getThenRegion());`
`309`	`309`	`auto else_type = get_yielded_type(getElseRegion());`
`310`		`- return mlir::success(areTypesCompatible(then_type, else_type));`
	`310`	`+ bool compatible = typesMatch(then_type, else_type);`
	`311`	`+ if (!compatible)`
	`312`	`+ {`
	`313`	`+ VAST_REPORT("Failed to verify that return types {0}, {1} in CondOp regions match. See location {2}",`
	`314`	`+ then_type, else_type, getLoc());`
	`315`	`+ }`
	`316`	`+ return mlir::success(compatible);`
`311`	`317`	`}`
`312`	`318`
`313`	`319`	`void WhileOp::build(Builder &bld, State &st, BuilderCallback cond, BuilderCallback body)`