Mercurial > hg > graal-jvmci-8
diff src/share/vm/opto/bytecodeInfo.cpp @ 1543:1a1603f975b5
Merge
author | kvn |
---|---|
date | Wed, 19 May 2010 10:22:39 -0700 |
parents | cd5dbf694d45 |
children | c18cbe5936b8 61b2245abf36 |
line wrap: on
line diff
--- a/src/share/vm/opto/bytecodeInfo.cpp Mon Apr 05 10:17:15 2010 -0700 +++ b/src/share/vm/opto/bytecodeInfo.cpp Wed May 19 10:22:39 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