From 2aa8c5d1d0659bd1c828134f1a1f14d025a2d0f1 Mon Sep 17 00:00:00 2001
From: Cliff Click <cliffc@acm.org>
Date: Fri, 7 Feb 2025 08:58:36 -0800
Subject: Ch# Chapter 19: Instruction Selection and Portable Compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: hadha <helsgithub15@gmail.com>
Co-authored-by: Tamás Hadházy <85063808+Hels15@users.noreply.github.com>
---
 src/test/java/com/seaofnodes/simple/Eval2.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/test/java/com/seaofnodes/simple/Eval2.java')

diff --git a/src/test/java/com/seaofnodes/simple/Eval2.java b/src/test/java/com/seaofnodes/simple/Eval2.java
index 2da834e5..6ae8427c 100644
--- a/src/test/java/com/seaofnodes/simple/Eval2.java
+++ b/src/test/java/com/seaofnodes/simple/Eval2.java
@@ -179,7 +179,7 @@ public abstract class Eval2 {
         int path = r._inputs.find( prior );
         // Parameters read from prior frame, Phis from local frame
         Frame frame = (r instanceof FunNode ? F._prior : F);
-        boolean isMain = r instanceof FunNode fun && fun.sig().isa(TypeFunPtr.MAIN);
+        boolean isMain = r instanceof FunNode fun && fun.sig().isa(CodeGen.CODE._main);
 
         // Parallel assign Phis.  First parallel read and cache
         int i;
@@ -341,7 +341,7 @@ public abstract class Eval2 {
         int num = type._fields.length;
         Object[] ptr = new Object[num];
         for( int i=0; i<num; i++ )
-            ptr[i] = val(alloc.in(2+i+num));
+            ptr[i] = con(type._fields[i]._type.makeZero());
         return ptr;
     }
 
@@ -357,6 +357,8 @@ public abstract class Eval2 {
     }
 
     private static Object store( StoreNode st ) {
+        if( st._name.equals("#") )
+            return "$mem";      // Eval stores the length in the java object[], no need to set it now
         TypeMemPtr tmp = (TypeMemPtr)st.ptr()._type;
         Object[] fs = (Object[])val(st.ptr());
         int idx = tmp._obj.isAry()
-- 
cgit v1.2.3