--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/FullInfopointOp.java	Fri May 12 13:14:25 2017 -0700
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.lir/src/org/graalvm/compiler/lir/FullInfopointOp.java	Fri May 12 13:56:13 2017 -0700
@@ -45,7 +45,7 @@
 
     @Override
     public void emitCode(CompilationResultBuilder crb) {
+        crb.recordInfopoint(crb.asm.position(), state, reason);
         crb.asm.ensureUniquePC();
-        crb.recordInfopoint(crb.asm.position(), state, reason);
     }
 }