Fix lowering symbol

Author: FlandiaYingman

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

@@ -194,7 +194,7 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
   final def term(t: st, inStmtPos: Bool = false)(k: Result => Block)(using Subst): Block =
     tl.log(s"Lowering.term ${t.showDbg.truncate(100, "[...]")}${
       if inStmtPos then " (in stmt)" else ""}${
-      t.symbol.fold("")(" – symbol " + _)}")
+      t.resolvedSymbol.fold("")(" – symbol " + _)}")
 
     def warnStmt = if inStmtPos then
       raise:
@@ -306,7 +306,7 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
         End("error")
     case st.TyApp(f, ts) => term(f)(k) // * Type arguments are erased
     case st.App(f, arg) =>
-      val isMlsFun = f.symbol.fold(f.isInstanceOf[st.Lam]):
+      val isMlsFun = f.resolvedSymbol.fold(f.isInstanceOf[st.Lam]):
         case _: sem.BuiltinSymbol => true
         case sym: sem.BlockMemberSymbol =>
           sym.trmImplTree.fold(sym.clsTree.isDefined)(_.k is syntax.Fun)
@@ -320,17 +320,17 @@ class Lowering()(using Config, TL, Raise, State, Ctx):
           subTerm_nonTail(arg): ar =>
             k(Call(fr, Arg(spread = true, ar) :: Nil)(isMlsFun, true).withLocOf(t))
       f match
-      case t if t.symbol.isDefined && (t.symbol.get is ctx.builtins.js.try_catch) =>
+      case t if t.resolvedSymbol.isDefined && (t.resolvedSymbol.get is ctx.builtins.js.try_catch) =>
         conclude(Value.Ref(State.runtimeSymbol).selN(Tree.Ident("try_catch")))
-      case t if t.symbol.isDefined && (t.symbol.get is ctx.builtins.debug.printStack) =>
+      case t if t.resolvedSymbol.isDefined && (t.resolvedSymbol.get is ctx.builtins.debug.printStack) =>
         if !config.effectHandlers.exists(_.debug) then
           raise(ErrorReport(
             msg"Debugging functions are not enabled" ->
             t.toLoc :: Nil,
             source = Diagnostic.Source.Compilation))
           return End("error")
         conclude(Value.Ref(State.runtimeSymbol).selSN("raisePrintStackEffect").withLocOf(f))
-      case t if t.symbol.isDefined && (t.symbol.get is ctx.builtins.debug.getLocals) =>
+      case t if t.resolvedSymbol.isDefined && (t.resolvedSymbol.get is ctx.builtins.debug.getLocals) =>
         if !config.effectHandlers.exists(_.debug) then
           raise(ErrorReport(
             msg"Debugging functions are not enabled" ->

hkmc2/shared/src/test/mlscript-compile/Runtime.mjs

@@ -311,7 +311,7 @@ let Runtime1;
     tmp = runtime.safeCall(f());
     res = tmp;
     if (res instanceof Runtime.EffectSig.class) {
-      return Runtime.EffectHandle(res)
+      return runtime.safeCall(Runtime.EffectHandle(res))
     } else {
       return res
     }

hkmc2/shared/src/test/mlscript/codegen/OpenWildcard.mls

@@ -58,7 +58,7 @@ val Option = "Oops"
 :sjs
 Some(123)
 //│ JS (unsanitized):
-//│ Option.Some(123)
+//│ runtime.safeCall(Option.Some(123))
 //│ = Some(123)
 
 module Option with

hkmc2/shared/src/test/mlscript/codegen/SanityChecks.mls

@@ -260,7 +260,7 @@ if M.A(1).y is
 //│   }
 //│   static toString() { return "M"; }
 //│ });
-//│ tmp5 = runtime.checkCall(M1.A(1));
+//│ tmp5 = runtime.safeCall(M1.A(1));
 //│ selRes2 = tmp5.y;
 //│ discarded1 = tmp5.y$__checkNotMethod;
 //│ if (selRes2 === undefined) {
@@ -289,7 +289,7 @@ M.A(1).y
 //│ if (selRes3 === undefined) {
 //│   throw new this.Error("Access to required field 'console' yielded 'undefined'");
 //│ }
-//│ tmp6 = runtime.checkCall(M1.A(1));
+//│ tmp6 = runtime.safeCall(M1.A(1));
 //│ selRes4 = tmp6.y;
 //│ discarded2 = tmp6.y$__checkNotMethod;
 //│ if (selRes4 === undefined) {
@@ -306,7 +306,9 @@ M.A(1).y
 M.A(1).y
   console.log()
 //│ JS:
-//│ tmp7 = M1.A(1); block$res15 = runtime.safeCall(this.console.log(tmp7.y)); undefined
+//│ tmp7 = runtime.safeCall(M1.A(1));
+//│ block$res15 = runtime.safeCall(this.console.log(tmp7.y));
+//│ undefined
 //│ > undefined
 
 :noSanityCheck
@@ -322,15 +324,15 @@ M.A(2).y > 1
 :ssjs
 M.A(1).g(0)
 //│ JS:
-//│ tmp10 = runtime.checkCall(M1.A(1)); block$res18 = runtime.safeCall(tmp10.g(0)); undefined
+//│ tmp10 = runtime.safeCall(M1.A(1)); block$res18 = runtime.safeCall(tmp10.g(0)); undefined
 //│ ═══[RUNTIME ERROR] TypeError: tmp10.g is not a function
 
 
 
 :ssjs
 M.A(1).f(0)
 //│ JS:
-//│ tmp11 = runtime.checkCall(M1.A(1)); block$res19 = runtime.safeCall(tmp11.f(0)); undefined
+//│ tmp11 = runtime.safeCall(M1.A(1)); block$res19 = runtime.safeCall(tmp11.f(0)); undefined
 //│ = 1
 
 

hkmc2/shared/src/test/mlscript/lifter/ModulesObjects.mls

@@ -170,7 +170,7 @@ M.A().get
 //│       }
 //│       toString() { return "A(" + "" + ")"; }
 //│     };
-//│     scrut = M14.A();
+//│     scrut = runtime.safeCall(M14.A());
 //│     if (scrut instanceof M14.A.class) {
 //│       tmp4 = 2;
 //│     } else {
@@ -180,7 +180,7 @@ M.A().get
 //│   }
 //│   static toString() { return "M"; }
 //│ });
-//│ tmp3 = M15.A();
+//│ tmp3 = runtime.safeCall(M15.A());
 //│ tmp3.get
 //│ = 4
 
@@ -237,7 +237,7 @@ M.A(2).newB.newA_B(3).newB.get
 //│     return this.A$instance$0.x;
 //│   } 
 //│   newA_B(y) {
-//│     return M19.A(y)
+//│     return runtime.safeCall(M19.A(y))
 //│   }
 //│   toString() { return "B(" + "" + ")"; }
 //│ };
@@ -253,7 +253,7 @@ M.A(2).newB.newA_B(3).newB.get
 //│         this.x = x;
 //│       }
 //│       get newA() {
-//│         return M18.A();
+//│         return runtime.safeCall(M18.A());
 //│       } 
 //│       get newB() {
 //│         return B$(this);
@@ -269,7 +269,7 @@ M.A(2).newB.newA_B(3).newB.get
 //│   }
 //│   static toString() { return "M"; }
 //│ });
-//│ tmp5 = M19.A(2);
+//│ tmp5 = runtime.safeCall(M19.A(2));
 //│ tmp6 = runtime.safeCall(tmp5.newB.newA_B(3));
 //│ tmp6.newB.get
 //│ = 3