# HG changeset patch # User Thomas Wuerthinger # Date 1303933102 -7200 # Node ID bb050fe2901d8fadb6c220fbe9a14bcf23aa3816 # Parent 84a2012f8cd1895345086f8499d3e8254e17078c Fixed regression wrt write barriers. diff -r 84a2012f8cd1 -r bb050fe2901d graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java --- a/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Wed Apr 27 21:29:17 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/gen/LIRGenerator.java Wed Apr 27 21:38:22 2011 +0200 @@ -1597,7 +1597,7 @@ } public boolean requiresNullCheck() { - return current == null || current instanceof InstanceOf || current instanceof CheckCast;//current.canTrap(); + return current == null || current.canTrap(); } public boolean requiresBoundsCheck() { @@ -1605,11 +1605,11 @@ } public boolean requiresReadBarrier() { - return current == null || current.kind == CiKind.Object; + return current == null || true; } public boolean requiresWriteBarrier() { - return current == null || current.kind == CiKind.Object; + return current == null || true; } public boolean requiresArrayStoreCheck() {