Mercurial > hg > truffle
diff src/share/vm/oops/typeArrayKlass.cpp @ 484:ffe19141e312
Merge
author | jmasa |
---|---|
date | Fri, 12 Dec 2008 15:37:46 -0800 |
parents | 7d7a7c599c17 |
children | 0fbdb4381b99 |
line wrap: on
line diff
--- a/src/share/vm/oops/typeArrayKlass.cpp Fri Dec 12 10:19:39 2008 -0800 +++ b/src/share/vm/oops/typeArrayKlass.cpp Fri Dec 12 15:37:46 2008 -0800 @@ -36,13 +36,14 @@ return element_type() == tak->element_type(); } -klassOop typeArrayKlass::create_klass(BasicType type, int scale, TRAPS) { +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) { - sym = oopFactory::new_symbol_handle(external_name(type), CHECK_NULL); + if (Universe::symbolKlassObj() != NULL && name_str != NULL) { + sym = oopFactory::new_symbol_handle(name_str, CHECK_NULL); } KlassHandle klassklass (THREAD, Universe::typeArrayKlassKlassObj());