Mercurial > hg > truffle
diff src/share/vm/c1x/c1x_VMEntries.cpp @ 2492:4e5515d09314
Fixed merge issues.
- Accessing static fields from the java.lang.Class object instead of the klassOop (1-line-change)
- Fixed issue with RiField object caching (the caching was only taking the offset as a field ID, but need to take offset+is_static)
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Fri, 22 Apr 2011 19:00:07 +0200 |
| parents | e3c42b8de67e |
| children | ad9b14650e15 |
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_VMEntries.cpp Fri Apr 22 15:30:53 2011 +0200 +++ b/src/share/vm/c1x/c1x_VMEntries.cpp Fri Apr 22 19:00:07 2011 +0200 @@ -295,6 +295,7 @@ ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder()); ciField *field = CURRENT_ENV->get_field_by_index(loading_klass, index); + Bytecodes::Code code = (Bytecodes::Code)(((int) byteCode) & 0xFF); Handle field_handle = C1XCompiler::get_RiField(field, loading_klass, cp->pool_holder(), code, THREAD); bool is_constant = field->is_constant(); @@ -369,7 +370,7 @@ if (method == NULL) { if (TraceC1X >= 3) { ResourceMark rm; - tty->print_cr("Could not resolve method %s %s on klass %d", name_symbol->as_C_string(), signature_symbol->as_C_string(), klass->klass_part()->name()->as_C_string()); + tty->print_cr("Could not resolve method %s %s on klass %s", name_symbol->as_C_string(), signature_symbol->as_C_string(), klass->klass_part()->name()->as_C_string()); } return NULL; } @@ -617,7 +618,7 @@ JNIEXPORT void JNICALL Java_com_sun_hotspot_c1x_VMEntries_recordBailout(JNIEnv *jniEnv, jobject message) { if (C1XBailoutIsFatal) { Handle msg = JNIHandles::resolve(message); - if (msg.is_null()) { + if (!msg.is_null()) { java_lang_String::print(msg, tty); } fatal("Bailout in C1X");