Mercurial > hg > truffle

diff src/share/vm/opto/bytecodeInfo.cpp @ 1507:cd5dbf694d45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6939134: JSR 292 adjustments to method handle invocation Summary: split MethodHandle.invoke into invokeExact and invokeGeneric; also clean up JVM-to-Java interfaces Reviewed-by: twisti
author jrose
date Sat, 01 May 2010 02:42:18 -0700
parents c3b315a0d58a
children c18cbe5936b8 61b2245abf36
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp	Fri Apr 30 08:37:24 2010 -0700
+++ b/src/share/vm/opto/bytecodeInfo.cpp	Sat May 01 02:42:18 2010 -0700
@@ -477,12 +477,7 @@
   }
   int new_depth_adjust = 0;
   if (caller_jvms->method() != NULL) {
-    if ((caller_jvms->method()->name() == ciSymbol::invoke_name() &&
-         caller_jvms->method()->holder()->name() == ciSymbol::java_dyn_MethodHandle())
-        || caller_jvms->method()->holder()->name() == ciSymbol::java_dyn_InvokeDynamic())
-      /* @@@ FIXME:
     if (caller_jvms->method()->is_method_handle_adapter())
-      */
       new_depth_adjust -= 1;  // don't count actions in MH or indy adapter frames
     else if (callee_method->is_method_handle_invoke()) {
       new_depth_adjust -= 1;  // don't count method handle calls from java.dyn implem