Chapter 25: Modules, Separate Compilation, and SSA Constructionlinear

Co-authored-by: Hsiang-Ying Fu <66062782+fuhsnn@users.noreply.github.com>
Co-authored-by: fuhsnn <66062782+fuhsnn@users.noreply.github.com>
Co-authored-by: Symious <14933944+symious@users.noreply.github.com>
Co-authored-by: Jun Kawasaki <jun784@gmail.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

3 files changed, 22 insertions, 25 deletions

diff --git a/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java b/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java
index b29eb2c3..ec9e3910 100644
--- a/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java
+++ b/src/test/java/com/seaofnodes/simple/fuzzer/Fuzzer.java
@@ -85,7 +85,7 @@ public class Fuzzer {
             code1 = FuzzerUtils.parse(script, 123, true);
         } catch (RuntimeException e1) {
             try {
-                FuzzerUtils.parse(script, 456, false);
+                FuzzerUtils.parse(script, 456, true);
             } catch (RuntimeException e2) {
                 if (FuzzerUtils.isExceptionFromSameCause(e1, e2)) {
                     if (!valid || e1.getClass() == Parser.ParseException.class) return;
@@ -163,26 +163,30 @@ public class Fuzzer {
         check(sb.toString(), valid, seed);
     }
 
-
     /**
-     * Check that no exceptions happened.
-     * @return true if no exception happened
+     * Run one seed as a regression test.  Unlike the exploratory fuzzer path,
+     * this deliberately does not reduce on failure; old bad seeds should fail
+     * fast with the seed visible in the JUnit assertion.
      */
-    public boolean noExceptions() {
-        return exceptions.isEmpty();
-    }
-
-    /** Run a fixed chapter-local seed without reducing or swallowing failures. */
     public void fuzzPeepsRegression(long seed) {
         var rand = new Random(seed);
         var sb = new StringBuilder();
         var valid = new ScriptGenerator(rand, sb, true).genProgram();
         try {
             runCheck(sb.toString(), valid);
-        } catch (Throwable e) {
-            AssertionError ae = new AssertionError("Fuzzer regression seed failed: " + seed);
+        } catch( Throwable e ) {
+            AssertionError ae = new AssertionError("Fuzzer regression seed failed: "+seed);
             ae.initCause(e);
             throw ae;
         }
     }
+
+
+    /**
+     * Check that no exceptions happened.
+     * @return true if no exception happened
+     */
+    public boolean noExceptions() {
+        return exceptions.isEmpty();
+    }
 }
diff --git a/src/test/java/com/seaofnodes/simple/fuzzer/FuzzerUtils.java b/src/test/java/com/seaofnodes/simple/fuzzer/FuzzerUtils.java
index 45558541..9fe2e405 100644
--- a/src/test/java/com/seaofnodes/simple/fuzzer/FuzzerUtils.java
+++ b/src/test/java/com/seaofnodes/simple/fuzzer/FuzzerUtils.java
@@ -94,13 +94,13 @@ class FuzzerUtils {
     /**
      * Parse and optimize using the given worklist seed
      */
-    public static CodeGen parse(String script, long workListSeed, boolean reset) {
+    public static CodeGen parse(String script, long workListSeed, boolean resetTypes ) {
         var err = System.err;
         var out = System.out;
         try {
             System.setErr(NULL_PRINT_STREAM);
             System.setOut(NULL_PRINT_STREAM);
-            var code = new CodeGen(script, TypeInteger.BOT, workListSeed, reset);
+            var code = new CodeGen(script, workListSeed, resetTypes);
             return code.driver(CodeGen.Phase.LocalSched);
         } finally {
             System.setErr(err);
diff --git a/src/test/java/com/seaofnodes/simple/fuzzer/ScriptGenerator.java b/src/test/java/com/seaofnodes/simple/fuzzer/ScriptGenerator.java
index 20815d5d..c5e94047 100644
--- a/src/test/java/com/seaofnodes/simple/fuzzer/ScriptGenerator.java
+++ b/src/test/java/com/seaofnodes/simple/fuzzer/ScriptGenerator.java
@@ -83,18 +83,11 @@ public class ScriptGenerator {
         }
     }
 
-    private static final List<TypeInt> INTTYPES = new ArrayList<>();
 
-    static {
-        for( var e : Parser.TYPES.entrySet() ) {
-            if( e.getValue() instanceof TypeInteger ) {
-                INTTYPES.add(new TypeInt(e.getKey()));
-            }
-        }
-    }
-
-    private static final Type TYPE_INT = INTTYPES.stream().filter(t->t.name.equals("int")).findAny().get();
-    private static final Type TYPE_BOOL = INTTYPES.stream().filter(t->t.name.equals("bool")).findAny().get();
+    private static final TypeInt TYPE_INT  = new TypeInt("int");
+    private static final TypeInt TYPE_BOOL = new TypeInt("bool");
+    private static final TypeInt TYPE_U8 = new TypeInt("u8");
+    private static final List<TypeInt> INTTYPES = new ArrayList<>(){{add(TYPE_INT); add(TYPE_BOOL); add(TYPE_U8); }};
 
     private static class Variable {
         final String name;
@@ -937,4 +930,4 @@ public class ScriptGenerator {
         else sb.append(v.name);
     }
 
-}
\ No newline at end of file
+}