src/hotspot/share/runtime/registerMap.hpp

rev 50307 : [mq]: cont

*** 73,92 ****
    LocationValidType _location_valid[location_valid_size];
    bool        _include_argument_oops;   // Should include argument_oop marked locations for compiler
    JavaThread* _thread;                  // Reference to current thread
    bool        _update_map;              // Tells if the register map need to be
                                          // updated when traversing the stack
  
  #ifdef ASSERT
    void check_location_valid();
  #else
    void check_location_valid() {}
  #endif
  
   public:
!   debug_only(intptr_t* _update_for_id;) // Assert that RegisterMap is not updated twice for same frame
!   RegisterMap(JavaThread *thread, bool update_map = true);
    RegisterMap(const RegisterMap* map);
  
    address location(VMReg reg) const {
      int index = reg->value() / location_valid_type_size;
      assert(0 <= reg->value() && reg->value() < reg_count, "range check");
--- 73,93 ----
    LocationValidType _location_valid[location_valid_size];
    bool        _include_argument_oops;   // Should include argument_oop marked locations for compiler
    JavaThread* _thread;                  // Reference to current thread
    bool        _update_map;              // Tells if the register map need to be
                                          // updated when traversing the stack
+   bool _validate_oops;                 // whether to perform valid oop checks in asserts
  
  #ifdef ASSERT
    void check_location_valid();
  #else
    void check_location_valid() {}
  #endif
  
   public:
!   DEBUG_ONLY(intptr_t* _update_for_id;) // Assert that RegisterMap is not updated twice for same frame
!   RegisterMap(JavaThread *thread, bool update_map = true, bool validate_oops = true);
    RegisterMap(const RegisterMap* map);
  
    address location(VMReg reg) const {
      int index = reg->value() / location_valid_type_size;
      assert(0 <= reg->value() && reg->value() < reg_count, "range check");
*** 114,123 ****
--- 115,125 ----
    bool include_argument_oops() const      { return _include_argument_oops; }
    void set_include_argument_oops(bool f)  { _include_argument_oops = f; }
  
    JavaThread *thread() const { return _thread; }
    bool update_map()    const { return _update_map; }
+   bool validate_oops() const { return _validate_oops; }
  
    void print_on(outputStream* st) const;
    void print() const;
  
    // the following contains the definition of pd_xxx methods