src/hotspot/share/classfile/javaClasses.cpp

*** 258,268 ****
    // No need to zero the offset, allocation zero'ed the entire String object
    set_coder(obj, is_latin1 ? CODER_LATIN1 : CODER_UTF16);
    return h_obj;
  }
  
! Handle java_lang_String::create_from_unicode(jchar* unicode, int length, TRAPS) {
    bool is_latin1 = CompactStrings && UNICODE::is_latin1(unicode, length);
    Handle h_obj = basic_create(length, is_latin1, CHECK_NH);
    typeArrayOop buffer = value(h_obj());
    assert(TypeArrayKlass::cast(buffer->klass())->element_type() == T_BYTE, "only byte[]");
    if (is_latin1) {
--- 258,268 ----
    // No need to zero the offset, allocation zero'ed the entire String object
    set_coder(obj, is_latin1 ? CODER_LATIN1 : CODER_UTF16);
    return h_obj;
  }
  
! Handle java_lang_String::create_from_unicode(const jchar* unicode, int length, TRAPS) {
    bool is_latin1 = CompactStrings && UNICODE::is_latin1(unicode, length);
    Handle h_obj = basic_create(length, is_latin1, CHECK_NH);
    typeArrayOop buffer = value(h_obj());
    assert(TypeArrayKlass::cast(buffer->klass())->element_type() == T_BYTE, "only byte[]");
    if (is_latin1) {
*** 288,298 ****
  #endif
  
    return h_obj;
  }
  
! oop java_lang_String::create_oop_from_unicode(jchar* unicode, int length, TRAPS) {
    Handle h_obj = create_from_unicode(unicode, length, CHECK_0);
    return h_obj();
  }
  
  Handle java_lang_String::create_from_str(const char* utf8_str, TRAPS) {
--- 288,298 ----
  #endif
  
    return h_obj;
  }
  
! oop java_lang_String::create_oop_from_unicode(const jchar* unicode, int length, TRAPS) {
    Handle h_obj = create_from_unicode(unicode, length, CHECK_0);
    return h_obj();
  }
  
  Handle java_lang_String::create_from_str(const char* utf8_str, TRAPS) {
*** 660,670 ****
      jbyte* position = value->byte_at_addr(start);
      return UNICODE::as_utf8(position, len, buf, buflen);
    }
  }
  
! bool java_lang_String::equals(oop java_string, jchar* chars, int len) {
    assert(java_string->klass() == SystemDictionary::String_klass(),
           "must be java_string");
    typeArrayOop value = java_lang_String::value_no_keepalive(java_string);
    int length = java_lang_String::length(java_string);
    if (length != len) {
--- 660,670 ----
      jbyte* position = value->byte_at_addr(start);
      return UNICODE::as_utf8(position, len, buf, buflen);
    }
  }
  
! bool java_lang_String::equals(oop java_string, const jchar* chars, int len) {
    assert(java_string->klass() == SystemDictionary::String_klass(),
           "must be java_string");
    typeArrayOop value = java_lang_String::value_no_keepalive(java_string);
    int length = java_lang_String::length(java_string);
    if (length != len) {
*** 2586,2596 ****
    assert(element->is_a(SystemDictionary::StackTraceElement_klass()), "sanity check");
  
    // Fill in class name
    ResourceMark rm(THREAD);
    const char* str = holder->external_name();
!   oop classname = StringTable::intern((char*) str, CHECK);
    java_lang_StackTraceElement::set_declaringClass(element(), classname);
    java_lang_StackTraceElement::set_declaringClassObject(element(), holder->java_mirror());
  
    oop loader = holder->class_loader();
    if (loader != NULL) {
--- 2586,2596 ----
    assert(element->is_a(SystemDictionary::StackTraceElement_klass()), "sanity check");
  
    // Fill in class name
    ResourceMark rm(THREAD);
    const char* str = holder->external_name();
!   oop classname = StringTable::intern(str, CHECK);
    java_lang_StackTraceElement::set_declaringClass(element(), classname);
    java_lang_StackTraceElement::set_declaringClassObject(element(), holder->java_mirror());
  
    oop loader = holder->class_loader();
    if (loader != NULL) {