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/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java b/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java
index f4db5624..ff60c695 100644
--- a/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java
+++ b/chapter18/src/test/java/com/seaofnodes/simple/Chapter05Test.java
@@ -134,6 +134,21 @@ return a;
     }
 
     @Test
+    public void testMergeSameCon() {
+        CodeGen code = new CodeGen(
+"""
+int a=arg;
+if( arg==1 )
+    a=3;
+else
+    a=3;
+return a;
+""");
+        code.parse().opto();
+        assertEquals("return 3;", code.print());
+    }
+
+    @Test
     public void testTrue() {
       StopNode stop = new Parser("return true;").parse();
       assertEquals("return 1;",stop.ret().print());