Merge pull request #2696 from tokiwa-software/dfa_use_super_lifeTime

dfa: simplify `DFA.lifeTime()` using `super.lifeTime()`
tokiwa-software · Mar 8, 2024 · b65cd32 · b65cd32
2 parents 66825a4 + eadc178
commit b65cd32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/src/dev/flang/fuir/FUIR.java b/src/dev/flang/fuir/FUIR.java
@@ -1208,7 +1208,7 @@ public LifeTime lifeTime(int cl, boolean pre)
                case Intrinsic -> LifeTime.Undefined;
                case Field     -> LifeTime.Call;
                case Routine   -> LifeTime.Unknown;
-               case Native    -> LifeTime.Unknown;
+               case Native    -> LifeTime.Undefined;
                });
 
       return result;

diff --git a/src/dev/flang/fuir/analysis/dfa/DFA.java b/src/dev/flang/fuir/analysis/dfa/DFA.java
@@ -977,29 +977,11 @@ public boolean clazzNeedsCode(int cl)
          */
         public LifeTime lifeTime(int cl, boolean pre)
         {
-          var result =
-            pre ? (switch (clazzKind(cl))
-                     {
-                     case Choice    -> LifeTime.Undefined;
-                     case Abstract  ,
-                          Intrinsic ,
-                          Field     ,
-                          Routine   ,
-                          Native    -> currentEscapes(cl, pre) ? LifeTime.Unknown :
-                                                                 LifeTime.Call;
-                     })
-                : (switch (clazzKind(cl))
-                     {
-                     case Abstract  -> LifeTime.Undefined;
-                     case Choice    -> LifeTime.Undefined;
-                     case Intrinsic -> LifeTime.Undefined;
-                     case Field     -> LifeTime.Call;
-                     case Routine   -> currentEscapes(cl, pre) ? LifeTime.Unknown :
-                                                                 LifeTime.Call;
-                     case Native    -> LifeTime.Undefined;
-                     });
-
-          return result;
+          return
+            pre || (clazzKind(cl) != FeatureKind.Routine)
+                ? super.lifeTime(cl, pre)
+                : currentEscapes(cl, pre) ? LifeTime.Unknown :
+                                            LifeTime.Call;
         }