# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1367344309 -7200
# Node ID 46e83862cc03c872f4aaf33b0cb76c229c7796ef
# Parent  ee3279c0f9a0986365d20bbe3feaaebd9fac057c
Fix merge

diff -r ee3279c0f9a0 -r 46e83862cc03 graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierVerificationTest.java
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierVerificationTest.java	Tue Apr 30 19:50:12 2013 +0200
+++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierVerificationTest.java	Tue Apr 30 19:51:49 2013 +0200
@@ -683,7 +683,7 @@
                     }
 
                     @Override
-                    protected State afterSplit(BeginNode node, State oldState) {
+                    protected State afterSplit(AbstractBeginNode node, State oldState) {
                         return new State();
                     }
                 };
diff -r ee3279c0f9a0 -r 46e83862cc03 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java
diff -r ee3279c0f9a0 -r 46e83862cc03 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java