Mercurial > hg > truffle
diff src/share/vm/graal/graalVMEntries.cpp @ 3688:ff6582ef15b3
Merge
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Tue, 22 Nov 2011 10:41:05 +0100 |
parents | 7958ebb561b0 89d28dec0a25 |
children | 872e949a0827 67e92894d065 |
line wrap: on
line diff
--- a/src/share/vm/graal/graalVMEntries.cpp Fri Nov 18 17:20:38 2011 +0100 +++ b/src/share/vm/graal/graalVMEntries.cpp Tue Nov 22 10:41:05 2011 +0100 @@ -496,7 +496,7 @@ // public void RiConstantPool_loadReferencedType(long vmId, int cpi); JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) { - TRACE_graal_3("VMEntries::RiConstantPool_lookupType"); + TRACE_graal_3("VMEntries::RiConstantPool_loadReferencedType"); VM_ENTRY_MARK; constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(type)))->constants(); @@ -724,9 +724,10 @@ VM_ENTRY_MARK; KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass))); - KlassHandle array = klass_handle->array_klass(THREAD); - Handle name = VmIds::toString<Handle>(array->name(), CHECK_NULL); - return JNIHandles::make_local(THREAD, GraalCompiler::createHotSpotTypeResolved(array, name, THREAD)()); + KlassHandle arr = klass_handle->array_klass(THREAD); + Handle name = VmIds::toString<Handle>(arr->name(), CHECK_NULL); + assert(arr->oop_is_array(), ""); + return JNIHandles::make_local(THREAD, GraalCompiler::createHotSpotTypeResolved(arr, name, THREAD)()); } // public RiField[] RiType_fields(HotSpotTypeResolved klass);