# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1366724690 -7200
# Node ID 5a43592b5112790a9bc281fbed6525998ff0d640
# Parent  324dcaedb1ed398ea57c99b076f462d902fdeacf# Parent  dd596345f28a6745c795a8a6774e5715115cb7fc
Merge.

diff -r 324dcaedb1ed -r 5a43592b5112 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierAdditionTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierAdditionTest.java	Tue Apr 23 15:44:07 2013 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierAdditionTest.java	Tue Apr 23 15:44:50 2013 +0200
@@ -48,8 +48,7 @@
         main.b = temp2;
     }
 
-    public static void test2Snippet() {
-        boolean test = true;
+    public static void test2Snippet(boolean test) {
         Container main = new Container();
         Container temp1 = new Container();
         Container temp2 = new Container();
@@ -57,11 +56,9 @@
             if (test) {
                 main.a = temp1;
                 main.b = temp2;
-                test = false;
             } else {
                 main.a = temp2;
                 main.b = temp1;
-                test = true;
             }
         }
     }
@@ -108,7 +105,7 @@
                 for (WriteNode write : graph.getNodes(WriteNode.class)) {
                     if (write.getWriteBarrierType() != WriteBarrierType.NONE) {
                         Assert.assertTrue(write.successors().count() == 1);
-                        Assert.assertTrue(write.successors().first() instanceof SerialWriteBarrier);
+                        Assert.assertTrue(write.next() instanceof SerialWriteBarrier);
                     }
                 }
             }