scala-wasm
diff --git a/‎project/JavalibIRCleaner.scala
Lines changed: 14 additions & 15 deletions b/‎project/JavalibIRCleaner.scala
Lines changed: 14 additions & 15 deletions
@@ -45,6 +45,8 @@ import sbt.{Logger, MessageOnlyException}
 final class JavalibIRCleaner(baseDirectoryURI: URI) {
   import JavalibIRCleaner._
 
+  type JSTypes = Map[ClassName, Option[JSNativeLoadSpec]]
+
   def cleanIR(dependencyFiles: Seq[File], libFileMappings: Seq[(File, File)],
       logger: Logger): Set[File] = {
 
@@ -155,19 +157,19 @@ final class JavalibIRCleaner(baseDirectoryURI: URI) {
     }
   }
 
-  private def getJSTypes(trees: Stream[ClassDef]): Map[ClassName, ClassDef] = {
-    trees.filter(_.kind.isJSType).reduce[Map[ClassName, ClassDef]](
-        Map.empty, (m, v) => m.updated(v.className, v), _ ++ _)
+  private def getJSTypes(trees: Stream[ClassDef]): JSTypes = {
+    trees.filter(_.kind.isJSType).reduce[JSTypes](
+        Map.empty, (m, v) => m.updated(v.className, v.jsNativeLoadSpec), _ ++ _)
   }
 
-  private def cleanTree(tree: ClassDef, jsTypes: Map[ClassName, ClassDef],
+  private def cleanTree(tree: ClassDef, jsTypes: JSTypes,
       errorManager: ErrorManager): ClassDef = {
     new ClassDefCleaner(tree.className, jsTypes, errorManager)
       .cleanClassDef(tree)
   }
 
   private final class ClassDefCleaner(enclosingClassName: ClassName,
-      jsTypes: Map[ClassName, ClassDef], errorManager: ErrorManager)
+      jsTypes: JSTypes, errorManager: ErrorManager)
       extends Transformers.ClassTransformer {
 
     def cleanClassDef(tree: ClassDef): ClassDef = {
@@ -496,16 +498,13 @@ final class JavalibIRCleaner(baseDirectoryURI: URI) {
     private def genLoadFromLoadSpecOf(className: ClassName)(
         implicit pos: Position): Tree = {
       jsTypes.get(className) match {
-        case Some(classDef) =>
-          classDef.jsNativeLoadSpec match {
-            case Some(loadSpec) =>
-              genLoadFromLoadSpec(loadSpec)
-            case None =>
-              reportError(
-                  s"${className.nameString} does not have a load spec " +
-                  "(this shouldn't have happened at all; bug in the compiler?)")
-              JSGlobalRef("Object")
-          }
+        case Some(Some(loadSpec)) =>
+          genLoadFromLoadSpec(loadSpec)
+        case Some(None) =>
+          reportError(
+              s"${className.nameString} does not have a load spec " +
+              "(this shouldn't have happened at all; bug in the compiler?)")
+          JSGlobalRef("Object")
         case None =>
           reportError(s"${className.nameString} is not a JS type")
           JSGlobalRef("Object")