src/hotspot/share/classfile/javaClasses.inline.hpp

rev 54430 : 8221836: Avoid recalculating String.hash when zero
Reviewed-by: jrose, pliden
Contributed-by: peter.levart@gmail.com, claes.redestad@oracle.com

*** 43,55 ****
  void java_lang_String::set_value(oop string, typeArrayOop buffer) {
    assert(initialized && (value_offset > 0), "Must be initialized");
    string->obj_field_put(value_offset, (oop)buffer);
  }
  
! void java_lang_String::set_hash(oop string, unsigned int hash) {
!   assert(initialized && (hash_offset > 0), "Must be initialized");
!   string->int_field_put(hash_offset, hash);
  }
  
  // Accessors
  bool java_lang_String::value_equals(typeArrayOop str_value1, typeArrayOop str_value2) {
    return (oopDesc::equals(str_value1, str_value2) ||
--- 43,55 ----
  void java_lang_String::set_value(oop string, typeArrayOop buffer) {
    assert(initialized && (value_offset > 0), "Must be initialized");
    string->obj_field_put(value_offset, (oop)buffer);
  }
  
! bool java_lang_String::hash_is_set(oop java_string) {
!   assert(initialized && (hash_offset > 0) && (hashIsZero_offset > 0), "Must be initialized");
!   return java_string->int_field(hash_offset) != 0 || java_string->bool_field(hashIsZero_offset) != 0;
  }
  
  // Accessors
  bool java_lang_String::value_equals(typeArrayOop str_value1, typeArrayOop str_value2) {
    return (oopDesc::equals(str_value1, str_value2) ||
*** 69,84 ****
    assert(initialized && (value_offset > 0), "Must be initialized");
    assert(is_instance(java_string), "must be java_string");
    return (typeArrayOop) java_string->obj_field_access<AS_NO_KEEPALIVE>(value_offset);
  }
  
- unsigned int java_lang_String::hash(oop java_string) {
-   assert(initialized && (hash_offset > 0), "Must be initialized");
-   assert(is_instance(java_string), "must be java_string");
-   return java_string->int_field(hash_offset);
- }
- 
  bool java_lang_String::is_latin1(oop java_string) {
    assert(initialized && (coder_offset > 0), "Must be initialized");
    assert(is_instance(java_string), "must be java_string");
    jbyte coder = java_string->byte_field(coder_offset);
    assert(CompactStrings || coder == CODER_UTF16, "Must be UTF16 without CompactStrings");
--- 69,78 ----