Mercurial > hg > truffle

comparison src/share/vm/graal/graalVMEntries.cpp @ 3674:d3d3dd0a3421

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a regression.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 21 Nov 2011 13:56:38 +0100
parents f198b24093f3
children 89d28dec0a25
comparison
equal deleted inserted replaced
3673:3b09031817ec 3674:d3d3dd0a3421
494 return JNIHandles::make_local(THREAD, result()); 494 return JNIHandles::make_local(THREAD, result());
495 } 495 }
496 496
497 // public void RiConstantPool_loadReferencedType(long vmId, int cpi); 497 // public void RiConstantPool_loadReferencedType(long vmId, int cpi);
498 JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) { 498 JNIEXPORT void JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiConstantPool_1loadReferencedType(JNIEnv *env, jobject, jobject type, jint index, jbyte op) {
499 TRACE_graal_3("VMEntries::RiConstantPool_lookupType"); 499 TRACE_graal_3("VMEntries::RiConstantPool_loadReferencedType");
500 VM_ENTRY_MARK; 500 VM_ENTRY_MARK;
501 501
502 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(type)))->constants(); 502 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(type)))->constants();
503 int byteCode = (op & 0xFF); 503 int byteCode = (op & 0xFF);
504 if (byteCode != Bytecodes::_checkcast && byteCode != Bytecodes::_instanceof && byteCode != Bytecodes::_new && byteCode != Bytecodes::_anewarray && byteCode != Bytecodes::_multianewarray) { 504 if (byteCode != Bytecodes::_checkcast && byteCode != Bytecodes::_instanceof && byteCode != Bytecodes::_new && byteCode != Bytecodes::_anewarray && byteCode != Bytecodes::_multianewarray) {
721 // public RiType RiType_arrayOf(HotSpotTypeResolved klass); 721 // public RiType RiType_arrayOf(HotSpotTypeResolved klass);
722 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiType_1arrayOf(JNIEnv *, jobject, jobject klass) { 722 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiType_1arrayOf(JNIEnv *, jobject, jobject klass) {
723 TRACE_graal_3("VMEntries::RiType_arrayOf"); 723 TRACE_graal_3("VMEntries::RiType_arrayOf");
724 VM_ENTRY_MARK; 724 VM_ENTRY_MARK;
725 725
726 tty->print_cr("entering");
726 KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass))); 727 KlassHandle klass_handle(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(klass)));
727 KlassHandle array = klass_handle->array_klass(THREAD); 728 KlassHandle arr = klass_handle->array_klass(THREAD);
728 Handle name = VmIds::toString<Handle>(array->name(), CHECK_NULL); 729 Handle name = VmIds::toString<Handle>(arr->name(), CHECK_NULL);
729 return JNIHandles::make_local(THREAD, GraalCompiler::createHotSpotTypeResolved(array, name, THREAD)()); 730 assert(arr->oop_is_array(), "");
731 return JNIHandles::make_local(THREAD, GraalCompiler::createHotSpotTypeResolved(arr, name, THREAD)());
730 } 732 }
731 733
732 // public RiField[] RiType_fields(HotSpotTypeResolved klass); 734 // public RiField[] RiType_fields(HotSpotTypeResolved klass);
733 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiType_1fields(JNIEnv *, jobject, jobject klass) { 735 JNIEXPORT jobject JNICALL Java_com_oracle_graal_hotspot_VMEntries_RiType_1fields(JNIEnv *, jobject, jobject klass) {
734 TRACE_graal_3("VMEntries::RiType_fields"); 736 TRACE_graal_3("VMEntries::RiType_fields");