Fix a regression for the fiber depth computation introduced by the ch…

…ange on 1/19/24, 5:35PM
xtclang · Feb 9, 2024 · 606d77d · 606d77d
1 parent 7715772
commit 606d77d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/javatools/src/main/java/org/xvm/runtime/Fiber.java b/javatools/src/main/java/org/xvm/runtime/Fiber.java
@@ -50,10 +50,10 @@ public Fiber(ServiceContext context, Message msgCall)
         f_fnCaller  = msgCall.f_fnCaller;
         m_status    = FiberStatus.Initial;
 
-        if (fiberCaller == null)
+        if (fiberCaller == null || fiberCaller.getStatus() == FiberStatus.Terminating)
             {
-            // an independent fiber is only limited by the timeout of the parent service
-            // and in general has no timeout
+            // an independent or asynchronous (e.g. created by "callLater") fiber is only limited
+            // by the timeout of the parent service and in general has no timeout
             f_nDepth = 0;
             }
         else

diff --git a/javatools/src/main/java/org/xvm/runtime/Frame.java b/javatools/src/main/java/org/xvm/runtime/Frame.java
@@ -155,7 +155,7 @@ protected Frame(Fiber fiber, int iCallerPC, Op[] aopNative,
         f_context   = fiber.f_context;
         f_iId       = f_context.m_iFrameCounter++;
         f_nDepth    = fiber.f_nDepth; // under-count, but works to prevent an infinite recursion
-        f_fiber      = fiber;
+        f_fiber     = fiber;
         f_framePrev = null;
         f_iPCPrev   = iCallerPC;
         f_function  = null;