--- a/src/hotspot/share/runtime/deoptimization.cpp	Thu Jul 12 11:24:10 2018 -0700
+++ b/src/hotspot/share/runtime/deoptimization.cpp	Thu Jul 12 11:57:06 2018 -0700
@@ -2044,7 +2044,7 @@
   bool ignore_maybe_prior_recompile;
   assert(!reason_is_speculate(reason), "reason speculate only used by compiler");
   // JVMCI uses the total counts to determine if deoptimizations are happening too frequently -> do not adjust total counts
-  bool update_total_counts = JVMCI_ONLY(false) NOT_JVMCI(true);
+  bool update_total_counts = true JVMCI_ONLY( && !UseJVMCICompiler);
   query_update_method_data(trap_mdo, trap_bci,
                            (DeoptReason)reason,
                            update_total_counts,