Mercurial > hg > graal-jvmci-8
diff graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRAssembler.java @ 2823:ac4b086cbd72
Merge
author | Gilles Duboscq <gilles.duboscq@oracle.com> |
---|---|
date | Mon, 30 May 2011 16:35:08 +0200 |
parents | c379183d1c54 |
children | 1cd59ca9ac86 |
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRAssembler.java Fri May 27 15:41:10 2011 +0200 +++ b/graal/GraalCompiler/src/com/sun/c1x/target/amd64/AMD64LIRAssembler.java Mon May 30 16:35:08 2011 +0200 @@ -529,9 +529,10 @@ if (op.cond() == Condition.TRUE) { if (op.info != null) { int codePos = codePos(); - if (codePos > tasm.lastSafepointPos()) { - tasm.recordImplicitException(codePos, op.info); + if (codePos <= tasm.lastSafepointPos()) { + masm.nop(); } + tasm.recordImplicitException(codePos(), op.info); } masm.jmp(op.label()); } else {