Move Scala runtime isSingleton to Java runtime (#4608)

This will help keep reflection code cross-compiling between Scala 2 and 3 cleanly
chipsalliance · Jan 10, 2025 · e12935e · e12935e
1 parent 0d73982
commit e12935e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 26 deletions.
diff --git a/firrtl/src/main/scala-2/Macros.scala b/firrtl/src/main/scala-2/Macros.scala
diff --git a/firrtl/src/main/scala-3/Macros.scala b/firrtl/src/main/scala-3/Macros.scala
diff --git a/firrtl/src/main/scala/firrtl/options/Phase.scala b/firrtl/src/main/scala/firrtl/options/Phase.scala
@@ -9,7 +9,7 @@ import logger.LazyLogging
 import scala.collection.mutable.LinkedHashSet
 
 import scala.reflect.ClassTag
-import firrtl.macros.Macros
+import java.lang.reflect.Modifier
 
 object Dependency {
   def apply[A <: DependencyAPI[_]: ClassTag]: Dependency[A] = {
@@ -33,7 +33,16 @@ object Dependency {
     }
   }
 
-  private def isSingleton(obj: AnyRef): Boolean = Macros.isSingletonImpl(obj)
+  private def isSingleton(obj: Any): Boolean = {
+    val clazz = obj.getClass
+    try {
+      // Check if the class has a static field named "MODULE$"
+      val moduleField = clazz.getDeclaredField("MODULE$")
+      Modifier.isStatic(moduleField.getModifiers)
+    } catch {
+      case _: NoSuchFieldException => false
+    }
+  }
 }
 
 case class Dependency[+A <: DependencyAPI[_]](id: Either[Class[_ <: A], A with Singleton]) {