--- old/src/hotspot/share/runtime/vmThread.cpp	2019-11-22 14:03:32.496020867 +0100
+++ new/src/hotspot/share/runtime/vmThread.cpp	2019-11-22 14:03:32.309014618 +0100
@@ -150,7 +150,7 @@
 
   HOTSPOT_VMOPS_REQUEST(
                    (char *) op->name(), strlen(op->name()),
-                   op->evaluation_mode());
+                   op->evaluate_at_safepoint() ? 0 : 1); 
 
   // Encapsulates VM queue policy. Currently, that
   // only involves putting them on the right list
@@ -392,7 +392,7 @@
     PerfTraceTime vm_op_timer(perf_accumulated_vm_operation_time());
     HOTSPOT_VMOPS_BEGIN(
                      (char *) op->name(), strlen(op->name()),
-                     op->evaluation_mode());
+                     op->evaluate_at_safepoint() ? 0 : 1);
 
     EventExecuteVMOperation event;
     op->evaluate();
@@ -402,7 +402,7 @@
 
     HOTSPOT_VMOPS_END(
                      (char *) op->name(), strlen(op->name()),
-                     op->evaluation_mode());
+                     op->evaluate_at_safepoint() ? 0 : 1);
   }
 
   // Mark as completed