hotspot/src/share/vm/oops/typeArrayKlass.cpp

rev 611 : Merge

*** 37,53 ****
    if (dimension() != tak->dimension()) return false;
  
    return element_type() == tak->element_type();
  }
  
! klassOop typeArrayKlass::create_klass(BasicType type, int scale, TRAPS) {
    typeArrayKlass o;
  
    symbolHandle sym(symbolOop(NULL));
    // bootstrapping: don't create sym if symbolKlass not created yet
!   if (Universe::symbolKlassObj() != NULL) {
!     sym = oopFactory::new_symbol_handle(external_name(type), CHECK_NULL);
    }   
    KlassHandle klassklass (THREAD, Universe::typeArrayKlassKlassObj());
  
    arrayKlassHandle k = base_create_array_klass(o.vtbl_value(), header_size(), klassklass, CHECK_NULL);
    typeArrayKlass* ak = typeArrayKlass::cast(k());
--- 37,54 ----
    if (dimension() != tak->dimension()) return false;
  
    return element_type() == tak->element_type();
  }
  
! klassOop typeArrayKlass::create_klass(BasicType type, int scale,
!                                       const char* name_str, TRAPS) {
    typeArrayKlass o;
  
    symbolHandle sym(symbolOop(NULL));
    // bootstrapping: don't create sym if symbolKlass not created yet
!   if (Universe::symbolKlassObj() != NULL && name_str != NULL) {
!     sym = oopFactory::new_symbol_handle(name_str, CHECK_NULL);
    }
    KlassHandle klassklass (THREAD, Universe::typeArrayKlassKlassObj());
  
    arrayKlassHandle k = base_create_array_klass(o.vtbl_value(), header_size(), klassklass, CHECK_NULL);
    typeArrayKlass* ak = typeArrayKlass::cast(k());