src/hotspot/share/runtime/deoptimization.hpp

rev 56205 : imported patch 8226705-v1

*** 135,167 ****
      Unpack_uncommon_trap        = 2, // redo last byte code (C2 only)
      Unpack_reexecute            = 3, // reexecute bytecode (C1 only)
      Unpack_LIMIT                = 4
    };
  
    // Checks all compiled methods. Invalid methods are deleted and
    // corresponding activations are deoptimized.
    static int deoptimize_dependents();
  
    // Deoptimizes a frame lazily. nmethod gets patched deopt happens on return to the frame
!   static void deoptimize(JavaThread* thread, frame fr, RegisterMap *reg_map);
!   static void deoptimize(JavaThread* thread, frame fr, RegisterMap *reg_map, DeoptReason reason);
  
  #if INCLUDE_JVMCI
    static address deoptimize_for_missing_exception_handler(CompiledMethod* cm);
    static oop get_cached_box(AutoBoxObjectValue* bv, frame* fr, RegisterMap* reg_map, TRAPS);
  #endif
  
    private:
    // Does the actual work for deoptimizing a single frame
    static void deoptimize_single_frame(JavaThread* thread, frame fr, DeoptReason reason);
  
-   // Helper function to revoke biases of all monitors in frame if UseBiasedLocking
-   // is enabled
-   static void revoke_biases_of_monitors(JavaThread* thread, frame fr, RegisterMap* map);
- 
  #if COMPILER2_OR_JVMCI
! JVMCI_ONLY(public:)
  
    // Support for restoring non-escaping objects
    static bool realloc_objects(JavaThread* thread, frame* fr, RegisterMap* reg_map, GrowableArray<ScopeValue*>* objects, TRAPS);
    static void reassign_type_array_elements(frame* fr, RegisterMap* reg_map, ObjectValue* sv, typeArrayOop obj, BasicType type);
    static void reassign_object_array_elements(frame* fr, RegisterMap* reg_map, ObjectValue* sv, objArrayOop obj);
--- 135,169 ----
      Unpack_uncommon_trap        = 2, // redo last byte code (C2 only)
      Unpack_reexecute            = 3, // reexecute bytecode (C1 only)
      Unpack_LIMIT                = 4
    };
  
+   static void deoptimize_all_marked();
+ 
+  private:
    // Checks all compiled methods. Invalid methods are deleted and
    // corresponding activations are deoptimized.
    static int deoptimize_dependents();
  
+   // Revoke biased locks at deopt.
+   static void revoke_from_deopt_handler(JavaThread* thread, frame fr, RegisterMap* map);
+ 
+  public:
    // Deoptimizes a frame lazily. nmethod gets patched deopt happens on return to the frame
!   static void deoptimize(JavaThread* thread, frame fr, RegisterMap *reg_map, DeoptReason reason = Reason_constraint);
  
  #if INCLUDE_JVMCI
    static address deoptimize_for_missing_exception_handler(CompiledMethod* cm);
    static oop get_cached_box(AutoBoxObjectValue* bv, frame* fr, RegisterMap* reg_map, TRAPS);
  #endif
  
    private:
    // Does the actual work for deoptimizing a single frame
    static void deoptimize_single_frame(JavaThread* thread, frame fr, DeoptReason reason);
  
  #if COMPILER2_OR_JVMCI
!  public:
  
    // Support for restoring non-escaping objects
    static bool realloc_objects(JavaThread* thread, frame* fr, RegisterMap* reg_map, GrowableArray<ScopeValue*>* objects, TRAPS);
    static void reassign_type_array_elements(frame* fr, RegisterMap* reg_map, ObjectValue* sv, typeArrayOop obj, BasicType type);
    static void reassign_object_array_elements(frame* fr, RegisterMap* reg_map, ObjectValue* sv, objArrayOop obj);