2 files changed, 6 insertions, 4 deletions
diff --git a/chapter25/src/main/java/com/seaofnodes/simple/node/LoadNode.java b/chapter25/src/main/java/com/seaofnodes/simple/node/LoadNode.java
index ff2d1138..0848e8e7 100644
--- a/chapter25/src/main/java/com/seaofnodes/simple/node/LoadNode.java
+++ b/chapter25/src/main/java/com/seaofnodes/simple/node/LoadNode.java
@@ -211,7 +211,7 @@ public class LoadNode extends MemOpNode {
     }
 
     private Node folded(Node win) {
-        return win instanceof StoreNode st ? extend(castRO(st.val())) : zero((NewNode)win);
+        return win instanceof StoreNode st ? extend(castRO(st.val()),st._declaredType) : zero((NewNode)win);
     }
 
     // Materialize only after the profitability search succeeds. The value Phi
@@ -267,8 +267,10 @@ public class LoadNode extends MemOpNode {
 
     // When a load bypasses a store, the store might truncate bits - and the
     // load will need to zero/sign-extend.
-    private Node extend(Node val) {
-        if( !(_declaredType instanceof TypeInteger ti) ) return val;
+    // Use the matching Store's width: while a class is open, this Load may
+    // already know its alias but not yet have recorded its storage type.
+    private Node extend(Node val, Type storage) {
+        if( !(storage instanceof TypeInteger ti) ) return val;
         if( ti._min==0 )        // Unsigned
             return new AndNode(null,val,con(ti._max));
         // Signed extension
diff --git a/chapter25/src/main/java/com/seaofnodes/simple/node/cpus/x86_64_v2/x86_64_v2.java b/chapter25/src/main/java/com/seaofnodes/simple/node/cpus/x86_64_v2/x86_64_v2.java
index f0598422..ab298f2e 100644
--- a/chapter25/src/main/java/com/seaofnodes/simple/node/cpus/x86_64_v2/x86_64_v2.java
+++ b/chapter25/src/main/java/com/seaofnodes/simple/node/cpus/x86_64_v2/x86_64_v2.java
@@ -551,7 +551,7 @@ public class x86_64_v2 extends Machine {
 
     private int imm( Node xval ) {
         assert val == null && imm == 0;
-        if( xval instanceof ConstantNode con && con._con instanceof TypeInteger ti) {
+        if( xval instanceof ConstantNode con && con._con instanceof TypeInteger ti && ti.isConstant() && imm32(ti.value()) ) {
             val = null;
             imm = (int) ti.value();
             assert imm == ti.value(); // In 32-bit range