Make suspended atom fields work for boxed atoms

engine/runtime-instrument-common/src/main/java/org/enso/interpreter/service/ExecutionService.java

@@ -33,15 +33,14 @@
 import org.enso.interpreter.instrument.profiling.ProfilingInfo;
 import org.enso.interpreter.node.MethodRootNode;
 import org.enso.interpreter.node.callable.FunctionCallInstrumentationNode;
-import org.enso.interpreter.node.expression.atom.QualifiedAccessorNode;
 import org.enso.interpreter.node.expression.builtin.BuiltinRootNode;
 import org.enso.interpreter.node.expression.builtin.text.util.TypeToDisplayTextNode;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.Module;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.callable.function.FunctionSchema;
 import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.scope.ModuleScope;
 import org.enso.interpreter.runtime.state.State;
@@ -739,6 +738,10 @@ public static FunctionPointer fromAtomConstructor(AtomConstructor atomConstructo
     }
 
     public static FunctionPointer fromFunction(Function function) {
+      var cons = AtomConstructor.accessorFor(function);
+      if (cons != null) {
+        return fromAtomConstructor(cons);
+      }
       RootNode rootNode = function.getCallTarget().getRootNode();
 
       QualifiedName moduleName;
@@ -751,12 +754,6 @@ public static FunctionPointer fromFunction(Function function) {
           typeName = methodNode.getType().getQualifiedName();
           functionName = methodNode.getMethodName();
         }
-        case QualifiedAccessorNode qualifiedAccessor -> {
-          AtomConstructor atomConstructor = qualifiedAccessor.getAtomConstructor();
-          moduleName = atomConstructor.getDefinitionScope().getModule().getName();
-          typeName = atomConstructor.getType().getQualifiedName();
-          functionName = atomConstructor.getName();
-        }
         case BuiltinRootNode builtinRootNode -> {
           moduleName = builtinRootNode.getModuleName();
           typeName = builtinRootNode.getTypeName();

engine/runtime-instrument-common/src/main/scala/org/enso/interpreter/instrument/job/ProgramExecutionSupport.scala

@@ -13,7 +13,7 @@ import org.enso.interpreter.instrument.profiling.ExecutionTime
 import org.enso.interpreter.node.callable.FunctionCallInstrumentationNode.FunctionCall
 import org.enso.interpreter.node.expression.builtin.meta.TypeOfNode
 import org.enso.interpreter.runtime.`type`.{Types, TypesGen}
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor
+import org.enso.interpreter.runtime.data.atom.AtomConstructor
 import org.enso.interpreter.runtime.callable.function.Function
 import org.enso.interpreter.runtime.control.ThreadInterruptedException
 import org.enso.interpreter.runtime.error.{

engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java

@@ -35,6 +35,7 @@
 import org.enso.interpreter.node.ProgramRootNode;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.IrToTruffle;
+import org.enso.interpreter.runtime.data.atom.AtomNewInstanceNode;
 import org.enso.interpreter.runtime.state.ExecutionEnvironment;
 import org.enso.interpreter.runtime.tag.AvoidIdInstrumentationTag;
 import org.enso.interpreter.runtime.tag.IdentifiedTag;
@@ -355,7 +356,8 @@ protected Object getScope(EnsoContext context) {
   protected Object getLanguageView(EnsoContext context, Object value) {
     if (value instanceof Boolean b) {
       var bool = context.getBuiltins().bool();
-      return b ? bool.getTrue().newInstance() : bool.getFalse().newInstance();
+      var cons = b ? bool.getTrue() : bool.getFalse();
+      return AtomNewInstanceNode.getUncached().newInstance(cons);
     }
     return null;
   }

engine/runtime/src/main/java/org/enso/interpreter/node/expression/atom/ConstantNode.java → engine/runtime/src/main/java/org/enso/interpreter/node/ConstantNode.java

@@ -1,10 +1,10 @@
-package org.enso.interpreter.node.expression.atom;
+package org.enso.interpreter.node;
 
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.RootNode;
 
-public class ConstantNode extends RootNode {
+public final class ConstantNode extends RootNode {
   private final Object constant;
 
   /**

engine/runtime/src/main/java/org/enso/interpreter/node/ExpressionNode.java

@@ -18,8 +18,8 @@
 import com.oracle.truffle.api.source.SourceSection;
 import java.util.UUID;
 import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.callable.function.Function;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.scope.DebugLocalScope;
 import org.enso.interpreter.runtime.tag.AvoidIdInstrumentationTag;
 import org.enso.interpreter.runtime.tag.IdentifiedTag;

engine/runtime/src/main/java/org/enso/interpreter/node/callable/IndirectInvokeCallableNode.java

@@ -16,9 +16,9 @@
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.callable.function.Function;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;

engine/runtime/src/main/java/org/enso/interpreter/node/callable/InvokeCallableNode.java

@@ -18,10 +18,10 @@
 import org.enso.interpreter.runtime.callable.UnresolvedConversion;
 import org.enso.interpreter.runtime.callable.UnresolvedSymbol;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.control.TailCallException;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.error.PanicSentinel;

engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/CurryNode.java

@@ -11,10 +11,10 @@
 import org.enso.interpreter.node.callable.InvokeCallableNodeGen;
 import org.enso.interpreter.runtime.callable.CallerInfo;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.callable.function.FunctionSchema;
 import org.enso.interpreter.runtime.control.TailCallException;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.state.State;
 
 /** Handles runtime function currying and oversaturated (eta-expanded) calls. */

engine/runtime/src/main/java/org/enso/interpreter/node/callable/dispatch/IndirectCurryNode.java

@@ -13,10 +13,10 @@
 import org.enso.interpreter.node.callable.InvokeCallableNode;
 import org.enso.interpreter.runtime.callable.CallerInfo;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.callable.function.FunctionSchema;
 import org.enso.interpreter.runtime.control.TailCallException;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.state.State;
 
 /**

engine/runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/ConstructorBranchNode.java

@@ -1,15 +1,19 @@
 package org.enso.interpreter.node.controlflow.caseexpr;
 
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
+import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeInfo;
 import com.oracle.truffle.api.profiles.CountingConditionProfile;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
-import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.atom.StructsLibrary;
 
 /** An implementation of the case expression specialised to working on constructors. */
 @NodeInfo(shortName = "ConstructorMatch")
@@ -36,15 +40,38 @@ public static ConstructorBranchNode build(
 
   @Specialization
   void doAtom(
-      VirtualFrame frame,
-      Object state,
-      Atom target,
-      @CachedLibrary(limit = "10") StructsLibrary structs) {
+      VirtualFrame frame, Object state, Atom target, @Cached FieldsAsArrayNode toArrayNode) {
     if (profile.profile(matcher == target.getConstructor())) {
-      accept(frame, state, structs.getFields(target));
+      var arr = toArrayNode.executeFields(target);
+      accept(frame, state, arr);
     }
   }
 
   @Fallback
   void doFallback(VirtualFrame frame, Object state, Object target) {}
+
+  abstract static class FieldsAsArrayNode extends Node {
+    abstract Object[] executeFields(Atom target);
+
+    @Specialization(
+        limit = "3",
+        guards = {"atom.getConstructor() == cons"})
+    @ExplodeLoop
+    Object[] fieldsFromAtomCached(
+        Atom atom,
+        @Cached("atom.getConstructor()") AtomConstructor cons,
+        @CachedLibrary(limit = "3") StructsLibrary structs) {
+      var arr = new Object[cons.getArity()];
+      for (var i = 0; i < arr.length; i++) {
+        arr[i] = structs.getField(atom, i);
+      }
+      return arr;
+    }
+
+    @Specialization
+    @TruffleBoundary
+    Object[] fieldsFromAtomUncached(Atom atom) {
+      return fieldsFromAtomCached(atom, atom.getConstructor(), StructsLibrary.getUncached());
+    }
+  }
 }

engine/runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/PolyglotSymbolTypeBranchNode.java

@@ -13,7 +13,7 @@
 import org.enso.interpreter.node.expression.builtin.meta.TypeOfNode;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.callable.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.Atom;
 import org.enso.interpreter.runtime.error.PanicException;
 
 /** An implementation of the case expression specialised to working on polyglot types. */

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/Boolean.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 import org.enso.interpreter.dsl.BuiltinType;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 
 // Note that Boolean BuiltinType cannot be moved to `.expression.builtin.bool`
 // because it currently breaks a lot of code generation for builtin methods.

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/Builtin.java

@@ -7,8 +7,8 @@
 import java.util.stream.IntStream;
 import org.enso.interpreter.EnsoLanguage;
 import org.enso.interpreter.runtime.callable.argument.ArgumentDefinition;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
 import org.enso.interpreter.runtime.data.Type;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
 import org.enso.interpreter.runtime.scope.ModuleScope;
 
 /** A base class for all classes annotated with @BuiltinType */

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/UniquelyConstructibleBuiltin.java

@@ -2,8 +2,9 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import java.util.List;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.atom.AtomNewInstanceNode;
 
 public abstract class UniquelyConstructibleBuiltin extends Builtin {
   private @CompilerDirectives.CompilationFinal AtomConstructor uniqueConstructor;
@@ -29,6 +30,6 @@ protected void postInitialize() {
   }
 
   public final Atom newInstance(Object... params) {
-    return uniqueConstructor.newInstance(params);
+    return AtomNewInstanceNode.getUncached().newInstance(uniqueConstructor, params);
   }
 }

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/CatchPanicNode.java

@@ -17,9 +17,8 @@
 import org.enso.interpreter.node.callable.thunk.ThunkExecutorNode;
 import org.enso.interpreter.node.expression.builtin.meta.IsValueOfTypeNode;
 import org.enso.interpreter.runtime.EnsoContext;
-import org.enso.interpreter.runtime.builtin.Builtins;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.callable.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomNewInstanceNode;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.state.State;
 
@@ -81,9 +80,10 @@ private Object executeCallbackOrRethrow(
       InteropLibrary interopLibrary) {
 
     if (profile.profile(isValueOfTypeNode.execute(panicType, payload))) {
-      Builtins builtins = EnsoContext.get(this).getBuiltins();
-      Atom caughtPanic =
-          builtins.caughtPanic().getUniqueConstructor().newInstance(payload, originalException);
+      var builtins = EnsoContext.get(this).getBuiltins();
+      var cons = builtins.caughtPanic().getUniqueConstructor();
+      var caughtPanic =
+          AtomNewInstanceNode.getUncached().newInstance(cons, payload, originalException);
       return invokeCallableNode.execute(handler, frame, state, new Object[] {caughtPanic});
     } else {
       try {

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/CaughtPanicConvertToDataflowErrorNode.java

@@ -8,8 +8,8 @@
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.StructsLibrary;
 import org.enso.interpreter.runtime.error.DataflowError;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.state.State;
@@ -32,9 +32,8 @@ Object doExecute(
       @CachedLibrary(limit = "5") InteropLibrary interopLibrary,
       @CachedLibrary(limit = "5") StructsLibrary structs) {
     Builtins builtins = EnsoContext.get(this).getBuiltins();
-    var fields = structs.getFields(self);
-    Object payload = fields[0];
-    Object originalException = fields[1];
+    var payload = structs.getField(self, 0);
+    var originalException = structs.getField(self, 1);
     if (interopLibrary.isException(originalException)) {
       return DataflowError.withTrace(payload, (AbstractTruffleException) originalException);
     } else {

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/NumberParseError.java

@@ -3,7 +3,8 @@
 import java.util.List;
 import org.enso.interpreter.dsl.BuiltinType;
 import org.enso.interpreter.node.expression.builtin.Builtin;
-import org.enso.interpreter.runtime.callable.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomNewInstanceNode;
 
 @BuiltinType
 public final class NumberParseError extends Builtin {
@@ -13,6 +14,6 @@ protected final List<Cons> getDeclaredConstructors() {
   }
 
   public final Atom newInstance(Object... params) {
-    return getConstructors()[0].newInstance(params);
+    return AtomNewInstanceNode.getUncached().newInstance(getConstructors()[0], params);
   }
 }

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/ThrowPanicNode.java

@@ -13,8 +13,8 @@
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.runtime.EnsoContext;
 import org.enso.interpreter.runtime.builtin.Builtins;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.StructsLibrary;
 import org.enso.interpreter.runtime.error.PanicException;
 
 @BuiltinMethod(

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/error/displaytext/InvalidConversionTargetToDisplayTextNode.java

@@ -8,9 +8,9 @@
 import com.oracle.truffle.api.nodes.Node;
 import org.enso.interpreter.dsl.BuiltinMethod;
 import org.enso.interpreter.node.expression.builtin.text.util.TypeToDisplayTextNode;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.AtomConstructor;
-import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.AtomConstructor;
+import org.enso.interpreter.runtime.data.atom.StructsLibrary;
 import org.enso.interpreter.runtime.data.text.Text;
 
 @BuiltinMethod(type = "Invalid_Conversion_Target", name = "to_display_text")

engine/runtime/src/main/java/org/enso/interpreter/node/expression/builtin/meta/AtomWithAHoleNode.java

@@ -18,11 +18,11 @@
 import org.enso.interpreter.runtime.callable.Annotation;
 import org.enso.interpreter.runtime.callable.argument.ArgumentDefinition;
 import org.enso.interpreter.runtime.callable.argument.CallArgumentInfo;
-import org.enso.interpreter.runtime.callable.atom.Atom;
-import org.enso.interpreter.runtime.callable.atom.StructsLibrary;
 import org.enso.interpreter.runtime.callable.function.Function;
 import org.enso.interpreter.runtime.callable.function.FunctionSchema;
 import org.enso.interpreter.runtime.data.EnsoObject;
+import org.enso.interpreter.runtime.data.atom.Atom;
+import org.enso.interpreter.runtime.data.atom.StructsLibrary;
 import org.enso.interpreter.runtime.data.vector.ArrayLikeHelpers;
 import org.enso.interpreter.runtime.error.PanicException;
 import org.enso.interpreter.runtime.state.State;
@@ -173,13 +173,12 @@ static SwapAtomFieldNode create() {
     }
 
     int findHoleIndex(Atom atom, HoleInAtom lazy) {
-      var arr = structs.getFields(atom);
-      if (lastIndex >= 0 && lastIndex < arr.length) {
-        if (arr[lastIndex] == lazy) {
+      if (lastIndex >= 0 && lastIndex < atom.getConstructor().getArity()) {
+        if (structs.getField(atom, lastIndex) == lazy) {
           return lastIndex;
         }
       }
-      int index = findHoleIndexLoop(arr, lazy);
+      int index = findHoleIndexLoop(atom, lazy);
       if (index == -1) {
         return -1;
       }
@@ -197,9 +196,9 @@ int findHoleIndex(Atom atom, HoleInAtom lazy) {
     }
 
     @CompilerDirectives.TruffleBoundary
-    private int findHoleIndexLoop(Object[] arr, HoleInAtom lazy) {
-      for (int i = 0; i < arr.length; i++) {
-        if (arr[i] == lazy) {
+    private int findHoleIndexLoop(Atom atom, HoleInAtom lazy) {
+      for (int i = 0; i < atom.getConstructor().getArity(); i++) {
+        if (structs.getField(atom, i) == lazy) {
           return i;
         }
       }