--- old/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp	2016-11-03 14:16:05.000000000 -0700
+++ new/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp	2016-11-03 14:16:05.000000000 -0700
@@ -256,7 +256,7 @@
 #if INCLUDE_JVMCI
   // Check if we need to take lock at entry of synchronized method.  This can
   // only occur on method entry so emit it only for vtos with step 0.
-  if (UseJVMCICompiler && state == vtos && step == 0) {
+  if ((UseJVMCICompiler || UseAOT) && state == vtos && step == 0) {
     Label L;
     __ cmpb(Address(thread, JavaThread::pending_monitorenter_offset()), 0);
     __ jcc(Assembler::zero, L);