Mercurial > hg > truffle

diff src/share/vm/c1x/c1x_VMEntries.cpp @ 1931:48bbaead8b6c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjustments after merge with OpenJDK repository.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Tue, 30 Nov 2010 16:39:35 +0100
parents fe69dec9a1ed
children 8d88c9ac9247
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_VMEntries.cpp	Tue Nov 30 14:53:30 2010 +0100
+++ b/src/share/vm/c1x/c1x_VMEntries.cpp	Tue Nov 30 16:39:35 2010 +0100
@@ -213,6 +213,7 @@
 JNIEXPORT jobject JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiConstantPool_1lookupMethod(JNIEnv *env, jobject, jlong vmId, jint index, jbyte byteCode) {
   VM_ENTRY_MARK;
 
+  index = C1XCompiler::to_cp_index_u2(index);
   constantPoolHandle cp = VmIds::get<constantPoolOop>(vmId);
 
   Bytecodes::Code bc = (Bytecodes::Code) (((int) byteCode) & 0xFF);
@@ -252,6 +253,7 @@
 JNIEXPORT jobject JNICALL Java_com_sun_hotspot_c1x_VMEntries_RiConstantPool_1lookupField(JNIEnv *env, jobject, jlong vmId, jint index, jbyte byteCode) {
   VM_ENTRY_MARK;
 
+  index = C1XCompiler::to_cp_index_u2(index);
   constantPoolOop cp = VmIds::get<constantPoolOop>(vmId);
 
   ciInstanceKlass* loading_klass = (ciInstanceKlass *) CURRENT_ENV->get_object(cp->pool_holder());