Mercurial > hg > truffle

diff src/share/vm/graal/graalCompilerToVM.cpp @ 5395:fc1943f18fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed bug in returning array values from CompilerToVMImpl.executeCompiledMethodVarargs
author Doug Simon <doug.simon@oracle.com>
date Mon, 14 May 2012 21:51:32 +0200
parents b5cd7bc05695
children e1f45fcddb49
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Fri May 11 16:58:22 2012 +0200
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Mon May 14 21:51:32 2012 +0200
@@ -1047,7 +1047,7 @@
 
   if (jap.get_ret_type() == T_VOID) {
     return NULL;
-  } else if (jap.get_ret_type() == T_OBJECT) {
+  } else if (jap.get_ret_type() == T_OBJECT || jap.get_ret_type() == T_ARRAY) {
     return JNIHandles::make_local((oop) result.get_jobject());
   } else {
     oop o = java_lang_boxing_object::create(jap.get_ret_type(), (jvalue *) result.get_value_addr(), CHECK_NULL);