Mercurial > hg > truffle
changeset 9442:46e83862cc03
Fix merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Tue, 30 Apr 2013 19:51:49 +0200 |
parents | ee3279c0f9a0 |
children | 490d283dbe90 |
files | graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/WriteBarrierVerificationTest.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractBeginNode.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/AbstractEndNode.java |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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(); } };