Cache ModelElements for dynamic and Never

dart-lang · Jul 8, 2024 · f940c5f · f940c5f
1 parent 22417c8
commit f940c5f
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/lib/src/model/model_element.dart b/lib/src/model/model_element.dart
@@ -205,13 +205,6 @@ abstract class ModelElement
         e.kind == ElementKind.DYNAMIC ||
         e.kind == ElementKind.NEVER);
 
-    if (e.kind == ElementKind.DYNAMIC) {
-      return Dynamic(e, packageGraph);
-    }
-    if (e.kind == ElementKind.NEVER) {
-      return NeverType(e, packageGraph);
-    }
-
     Member? originalMember;
     // TODO(jcollins-g): Refactor object model to instantiate 'ModelMembers'
     //                   for members?
@@ -221,12 +214,21 @@ abstract class ModelElement
     }
 
     // Return the cached ModelElement if it exists.
-    var cachedModelElement = packageGraph.allConstructedModelElements[
-        ConstructedModelElementsKey(e, library, enclosingContainer)];
+    var key = ConstructedModelElementsKey(e, library, enclosingContainer);
+    var cachedModelElement = packageGraph.allConstructedModelElements[key];
     if (cachedModelElement != null) {
       return cachedModelElement;
     }
 
+    if (e.kind == ElementKind.DYNAMIC) {
+      return packageGraph.allConstructedModelElements[key] =
+          Dynamic(e, packageGraph);
+    }
+    if (e.kind == ElementKind.NEVER) {
+      return packageGraph.allConstructedModelElements[key] =
+          NeverType(e, packageGraph);
+    }
+
     var newModelElement = ModelElement._constructFromElementDeclaration(
       e,
       library,