[MooreToCore] Return early on non-convertable type (#7631)

llvm · Sep 25, 2024 · 7c80a60 · 7c80a60
1 parent 77f49fb
commit 7c80a60
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/lib/Conversion/MooreToCore/MooreToCore.cpp b/lib/Conversion/MooreToCore/MooreToCore.cpp
@@ -472,6 +472,8 @@ struct VariableOpConversion : public OpConversionPattern<VariableOp> {
                   ConversionPatternRewriter &rewriter) const override {
     Location loc = op.getLoc();
     Type resultType = typeConverter->convertType(op.getResult().getType());
+    if (!resultType)
+      return rewriter.notifyMatchFailure(op.getLoc(), "invalid variable type");
 
     // Determine the initial value of the signal.
     Value init = adaptor.getInitial();

diff --git a/test/Conversion/MooreToCore/errors.mlir b/test/Conversion/MooreToCore/errors.mlir
@@ -0,0 +1,8 @@
+// RUN: circt-opt --convert-moore-to-core --split-input-file --verify-diagnostics
+
+func.func @invalidType() {
+  // expected-error @below {{failed to legalize operation 'moore.variable'}}
+  %var = moore.variable : <!moore.queue<string, 42>>
+
+  return
+}