src/hotspot/share/runtime/vmOperations.hpp

rev 56967 : [mq]: 8234086-v2
rev 56968 : imported patch 8234086-v4

@@ -128,17 +128,10 @@
   template(GTestExecuteAtSafepoint)               \
   template(JFROldObject)                          \
 
 class VM_Operation : public StackObj {
  public:
-  // An operation can either be done inside a safepoint
-  // or concurrently with Java threads running.
-  enum Mode {
-    _safepoint,
-    _no_safepoint
-  };
-
   enum VMOp_Type {
     VM_OPS_DO(VM_OP_ENUM)
     VMOp_Terminating
   };
 

@@ -181,19 +174,16 @@
   void set_next(VM_Operation *next)              { _next = next; }
   void set_prev(VM_Operation *prev)              { _prev = prev; }
 
   // Configuration. Override these appropriately in subclasses.
   virtual VMOp_Type type() const = 0;
-  virtual Mode evaluation_mode() const            { return _safepoint; }
   virtual bool allow_nested_vm_operations() const { return false; }
   virtual void oops_do(OopClosure* f)              { /* do nothing */ };
 
-  bool evaluate_at_safepoint() const {
-    return evaluation_mode() == _safepoint;
-  }
-
-  static const char* mode_to_string(Mode mode);
+  // An operation can either be done inside a safepoint
+  // or concurrently with Java threads running.
+  virtual bool evaluate_at_safepoint() const { return true; }
 
   // Debugging
   virtual void print_on_error(outputStream* st) const;
   virtual const char* name() const  { return _names[type()]; }
   static const char* name(int type) {

@@ -469,11 +459,10 @@
   outputStream* _out;
 
  public:
   VM_PrintCompileQueue(outputStream* st) : _out(st) {}
   VMOp_Type type() const { return VMOp_PrintCompileQueue; }
-  Mode evaluation_mode() const { return _safepoint; }
   void doit();
 };
 
 #if INCLUDE_SERVICES
 class VM_PrintClassHierarchy: public VM_Operation {