[FIRRTL][ResolvePaths] Fix detection of agg target if alias. (#7257)

llvm · Jul 1, 2024 · 461f893 · 461f893
1 parent 624a3d9
commit 461f893
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/Dialect/FIRRTL/Transforms/ResolvePaths.cpp b/lib/Dialect/FIRRTL/Transforms/ResolvePaths.cpp
@@ -162,12 +162,12 @@ struct PathResolver {
     // we are targeting a module, the type will be null.
     if (Type targetType = path->ref.getType()) {
       auto fieldId = path->fieldIdx;
-      auto baseType = dyn_cast<FIRRTLBaseType>(targetType);
+      auto baseType = type_dyn_cast<FIRRTLBaseType>(targetType);
       if (!baseType)
         return emitError(loc, "unable to target non-hardware type ")
                << targetType;
       targetType = hw::FieldIdImpl::getFinalTypeByFieldID(baseType, fieldId);
-      if (isa<BundleType, FVectorType>(targetType))
+      if (type_isa<BundleType, FVectorType>(targetType))
         return emitError(loc, "unable to target aggregate type ") << targetType;
     }
 

diff --git a/test/Dialect/FIRRTL/resolve-paths-errors.mlir b/test/Dialect/FIRRTL/resolve-paths-errors.mlir
@@ -54,6 +54,15 @@ firrtl.module @BundleTarget(in %a : !firrtl.bundle<>) {
 
 // -----
 
+firrtl.circuit "AliasBundleTarget" {
+firrtl.module @AliasBundleTarget(in %a : !firrtl.alias<t, bundle<>>) {
+    // expected-error @below {{unable to target aggregate type '!firrtl.alias<t, bundle<>>'}}
+    %0 = firrtl.unresolved_path "OMReferenceTarget:~AliasBundleTarget|AliasBundleTarget>a"
+}
+}
+
+// -----
+
 firrtl.circuit "VectorTarget" {
 firrtl.module @VectorTarget(in %a : !firrtl.vector<uint<1>, 1>) {
     // expected-error @below {{unable to target aggregate type '!firrtl.vector<uint<1>, 1>'}}