Mercurial > hg > shark > hotspot

changeset 2256:a4a8883e8673

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More
author Gary Benson <gbenson@redhat.com>
date Tue, 01 Mar 2011 14:38:17 +0000
parents 0de165da3344
children c7908c6362ab
files src/cpu/zero/vm/cppInterpreter_zero.cpp
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Mar 01 11:56:05 2011 +0000
+++ b/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Mar 01 14:38:17 2011 +0000
@@ -781,8 +781,6 @@
     break;
 
   case MethodHandles::_adapter_retype_only:
-    break;
-
   case MethodHandles::_adapter_retype_raw:
     src_rtype = result_type_of_handle(
       java_dyn_MethodHandle::vmtarget(method_handle));
@@ -916,7 +914,13 @@
 
   // Adapt the result type, if necessary
   if (src_rtype != dst_rtype) {
-    if (dst_rtype == T_INT) {
+    switch (dst_rtype) {
+    case T_VOID:
+      for (int i = 0; i < type2size[src_rtype]; i++)
+        stack->pop();
+      return;
+
+    case T_INT:
       switch (src_rtype) {
       case T_VOID:
         // XXX check for overflow