--- a/hotspot/src/share/vm/runtime/deoptimization.cpp	Fri Feb 03 12:26:10 2017 +0100
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp	Fri Feb 03 19:26:35 2017 -0800
@@ -1813,7 +1813,7 @@
     // aggressive optimization.
     bool inc_recompile_count = false;
     ProfileData* pdata = NULL;
-    if (ProfileTraps && update_trap_state && trap_mdo != NULL) {
+    if (ProfileTraps && !is_client_compilation_mode_vm() && update_trap_state && trap_mdo != NULL) {
       assert(trap_mdo == get_method_data(thread, profiled_method, false), "sanity");
       uint this_trap_count = 0;
       bool maybe_prior_trap = false;