Handler runtime improvements (#282)

Co-authored-by: Lionel Parreaux <[email protected]>
Co-authored-by: CAG2Mark <[email protected]>

Author: 3 people

hkmc2/shared/src/main/scala/hkmc2/Diagnostic.scala

@@ -91,6 +91,6 @@ object Loc:
   def apply(xs: IterableOnce[Located]): Opt[Loc] =
     xs.iterator.foldLeft(none[Loc])((acc, l) => acc.fold(l.toLoc)(_ ++ l.toLoc |> some))
 
-final case class Origin(fileName: Str, startLineNum: Int, fph: FastParseHelpers):
-  override def toString = s"$fileName:+$startLineNum"
+final case class Origin(fileName: os.Path, startLineNum: Int, fph: FastParseHelpers):
+  override def toString = s"${fileName.last}:+$startLineNum"
 

hkmc2/shared/src/main/scala/hkmc2/MLsCompiler.scala

@@ -16,7 +16,7 @@ class ParserSetup(file: os.Path, dbgParsing: Bool)(using Elaborator.State, Raise
 
   val block = os.read(file)
   val fph = new FastParseHelpers(block)
-  val origin = Origin(file.toString, 0, fph)
+  val origin = Origin(file, 0, fph)
 
   val lexer = new syntax.Lexer(origin, dbg = dbgParsing)
   val tokens = lexer.bracketedTokens

hkmc2/shared/src/main/scala/hkmc2/codegen/HandlerLowering.scala

@@ -9,19 +9,19 @@ import hkmc2.semantics.*
 import hkmc2.syntax.Tree
 
 class StackSafeTransform(depthLimit: Int)(using State):
-  private val STACK_LIMIT_IDENT: Tree.Ident = Tree.Ident("__stackLimit")
-  private val STACK_DEPTH_IDENT: Tree.Ident = Tree.Ident("__stackDepth")
-  private val STACK_OFFSET_IDENT: Tree.Ident = Tree.Ident("__stackOffset")
-  private val STACK_HANDLER_IDENT: Tree.Ident = Tree.Ident("__stackHandler")
-
-  private val predefPath: Path = State.globalThisSymbol.asPath.selN(Tree.Ident("Predef"))
-  private val checkDepthPath: Path = predefPath.selN(Tree.Ident("checkDepth"))
-  private val resetDepthPath: Path = predefPath.selN(Tree.Ident("resetDepth"))
-  private val stackDelayClsPath: Path = predefPath.selN(Tree.Ident("__StackDelay"))
-  private val stackLimitPath: Path = predefPath.selN(STACK_LIMIT_IDENT)
-  private val stackDepthPath: Path = predefPath.selN(STACK_DEPTH_IDENT)
-  private val stackOffsetPath: Path = predefPath.selN(STACK_OFFSET_IDENT)
-  private val stackHandlerPath: Path = predefPath.selN(STACK_HANDLER_IDENT)
+  private val STACK_LIMIT_IDENT: Tree.Ident = Tree.Ident("stackLimit")
+  private val STACK_DEPTH_IDENT: Tree.Ident = Tree.Ident("stackDepth")
+  private val STACK_OFFSET_IDENT: Tree.Ident = Tree.Ident("stackOffset")
+  private val STACK_HANDLER_IDENT: Tree.Ident = Tree.Ident("stackHandler")
+
+  private val runtimePath: Path = State.runtimeSymbol.asPath
+  private val checkDepthPath: Path = runtimePath.selN(Tree.Ident("checkDepth"))
+  private val resetDepthPath: Path = runtimePath.selN(Tree.Ident("resetDepth"))
+  private val stackDelayClsPath: Path = runtimePath.selN(Tree.Ident("StackDelay"))
+  private val stackLimitPath: Path = runtimePath.selN(STACK_LIMIT_IDENT)
+  private val stackDepthPath: Path = runtimePath.selN(STACK_DEPTH_IDENT)
+  private val stackOffsetPath: Path = runtimePath.selN(STACK_OFFSET_IDENT)
+  private val stackHandlerPath: Path = runtimePath.selN(STACK_HANDLER_IDENT)
 
   private def intLit(n: BigInt) = Value.Lit(Tree.IntLit(n))
 
@@ -33,22 +33,20 @@ class StackSafeTransform(depthLimit: Int)(using State):
   def extractRes(res: Result, isTailCall: Bool, f: Result => Block, sym: Option[Symbol], curDepth: => Symbol) =
     if isTailCall then
       blockBuilder
-        .assignFieldN(predefPath, STACK_DEPTH_IDENT, op("+", stackDepthPath, intLit(1)))
+        .assignFieldN(runtimePath, STACK_DEPTH_IDENT, op("+", stackDepthPath, intLit(1)))
         .ret(res)
     else
       val tmp = sym getOrElse TempSymbol(None, "tmp")
       val offsetGtDepth = TempSymbol(None, "offsetGtDepth")
       blockBuilder
-        .assignFieldN(predefPath, STACK_DEPTH_IDENT, op("+", stackDepthPath, intLit(1)))
+        .assignFieldN(runtimePath, STACK_DEPTH_IDENT, op("+", stackDepthPath, intLit(1)))
         .assign(tmp, res)
         .assign(tmp, Call(resetDepthPath, tmp.asPath.asArg :: curDepth.asPath.asArg :: Nil)(true, false))
         .rest(f(tmp.asPath))
-
-  def extractResTopLevel(res: Result, isTailCall: Bool, f: Result => Block, sym: Option[Symbol], curDepth: => Symbol) =
+  
+  def wrapStackSafe(body: Block, resSym: Local, rest: Block) =
     val resumeSym = VarSymbol(Tree.Ident("resume"))
     val handlerSym = TempSymbol(None, "stackHandler")
-    val resSym = sym getOrElse TempSymbol(None, "res")
-    val handlerRes = TempSymbol(None, "res")
 
     val clsSym = ClassSymbol(
       Tree.TypeDef(syntax.Cls, Tree.Error(), N, N),
@@ -64,26 +62,28 @@ class StackSafeTransform(depthLimit: Int)(using State):
         /* 
           fun perform() =
             stackOffset = stackDepth
-            let ret = resume()
-            ret
+            resume()
         */
         blockBuilder
-          .assignFieldN(predefPath, STACK_OFFSET_IDENT, stackDepthPath)
-          .assign(handlerRes, Call(Value.Ref(resumeSym), Nil)(true, true))
-          .ret(handlerRes.asPath)
+          .assignFieldN(runtimePath, STACK_OFFSET_IDENT, stackDepthPath)
+          .ret(Call(Value.Ref(resumeSym), Nil)(true, true))
       ) :: Nil,
       blockBuilder
-        .assignFieldN(predefPath, STACK_LIMIT_IDENT, intLit(depthLimit)) // set stackLimit before call
-        .assignFieldN(predefPath, STACK_OFFSET_IDENT, intLit(0)) // set stackOffset = 0 before call
-        .assignFieldN(predefPath, STACK_DEPTH_IDENT, intLit(1)) // set stackDepth = 1 before call
-        .assignFieldN(predefPath, STACK_HANDLER_IDENT, handlerSym.asPath) // assign stack handler
-        .rest(HandleBlockReturn(res)),
+        .assignFieldN(runtimePath, STACK_LIMIT_IDENT, intLit(depthLimit)) // set stackLimit before call
+        .assignFieldN(runtimePath, STACK_OFFSET_IDENT, intLit(0)) // set stackOffset = 0 before call
+        .assignFieldN(runtimePath, STACK_DEPTH_IDENT, intLit(1)) // set stackDepth = 1 before call
+        .assignFieldN(runtimePath, STACK_HANDLER_IDENT, handlerSym.asPath) // assign stack handler
+        .rest(body),
       blockBuilder // reset the stack safety values
-        .assignFieldN(predefPath, STACK_DEPTH_IDENT, intLit(0)) // set stackDepth = 0 after call
-        .assignFieldN(predefPath, STACK_HANDLER_IDENT, Value.Lit(Tree.UnitLit(true))) // set stackHandler = null
-        .rest(f(resSym.asPath))
+        .assignFieldN(runtimePath, STACK_DEPTH_IDENT, intLit(0)) // set stackDepth = 0 after call
+        .assignFieldN(runtimePath, STACK_HANDLER_IDENT, Value.Lit(Tree.UnitLit(true))) // set stackHandler = null
+        .rest(rest)
     )
 
+  def extractResTopLevel(res: Result, isTailCall: Bool, f: Result => Block, sym: Option[Symbol], curDepth: => Symbol) =
+    val resSym = sym getOrElse TempSymbol(None, "res")
+    wrapStackSafe(HandleBlockReturn(res), resSym, f(resSym.asPath))
+
   // Rewrites anything that can contain a Call to increase the stack depth
   def transform(b: Block, curDepth: => Symbol, isTopLevel: Bool = false): Block =
     def usesStack(r: Result) = r match
@@ -119,8 +119,21 @@ class StackSafeTransform(depthLimit: Int)(using State):
           val hdr2 = hdr.mapConserve(applyHandler)
           val bod2 = rewriteBlk(bod)
           val rst2 = applyBlock(rst)
-          HandleBlock(l2, res2, par2, args2, cls2, hdr2, bod2, rst2)
+          if isTopLevel then
+            val newRes = TempSymbol(N, "res")
+            val newHandler = HandleBlock(l2, newRes, par2, args2, cls2, hdr2, bod2, HandleBlockReturn(newRes.asPath))
+            wrapStackSafe(newHandler, res2, rst2)
+          else
+            HandleBlock(l2, res2, par2, args2, cls2, hdr2, bod2, rst2)
+        
         case _ => super.applyBlock(b)
+        
+        override def applyHandler(hdr: Handler): Handler =
+          val sym2 = hdr.sym.subst
+          val resumeSym2 = hdr.resumeSym.subst
+          val params2 = hdr.params.mapConserve(applyParamList)
+          val body2 = rewriteBlk(hdr.body)
+          Handler(sym2, resumeSym2, params2, body2)
 
       override def applyResult2(r: Result)(k: Result => Block): Block =
         if usesStack(r) then

hkmc2/shared/src/main/scala/hkmc2/codegen/StackSafeTransform.scala

@@ -142,6 +142,8 @@ object Elaborator:
     given State = this
     val globalThisSymbol = TopLevelSymbol("globalThis")
     val runtimeSymbol = TempSymbol(N, "runtime")
+    val effectSigSymbol = ClassSymbol(Tree.TypeDef(syntax.Cls, Tree.Error(), N, N), Tree.Ident("EffectSig"))
+    val returnClsSymbol = ClassSymbol(Tree.TypeDef(syntax.Cls, Tree.Error(), N, N), Tree.Ident("Return"))
     val builtinOpsMap =
       val baseBuiltins = builtins.map: op =>
           op -> BuiltinSymbol(op,

hkmc2/shared/src/main/scala/hkmc2/semantics/Elaborator.scala

@@ -44,7 +44,7 @@ class Importer:
 
         val block = os.read(file)
         val fph = new FastParseHelpers(block)
-        val origin = Origin(file.toString, 0, fph)
+        val origin = Origin(file, 0, fph)
 
         val sym = tl.trace(s">>> Importing $file"):