Merge pull request #258: same constant phi merge test

Preserve the regression across the Chapter 10 split by including it in both chapter10a and chapter10b. Validated Chapter05Test in all 22 affected snapshots (374 tests).

1 files changed, 15 insertions, 0 deletions

diff --git a/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java
index 91efc3d6..7beeb4d9 100644
--- a/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java
+++ b/chapter12/src/test/java/com/seaofnodes/simple/Chapter05Test.java
@@ -134,6 +134,21 @@ return a;""");
     }
 
     @Test
+    public void testMergeSameCon() {
+        Parser parser = new Parser(
+"""
+int a=arg;
+if( arg==1 )
+    a=3;
+else
+    a=3;
+return a;
+""");
+        StopNode ret = parser.parse();
+        assertEquals("return 3;", ret.toString());
+    }
+
+    @Test
     public void testTrue() {
       StopNode stop = new Parser("return true;").parse();
       assertEquals("return 1;",stop.toString());