1.1 --- a/src/share/vm/opto/bytecodeInfo.cpp Tue Jun 01 11:48:33 2010 -0700
1.2 +++ b/src/share/vm/opto/bytecodeInfo.cpp Wed Jun 02 22:45:42 2010 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -188,8 +188,8 @@
1.11 return NULL;
1.12 }
1.13
1.14 - // Always inline MethodHandle methods.
1.15 - if (callee_method->is_method_handle_invoke())
1.16 + // Always inline MethodHandle methods and generated MethodHandle adapters.
1.17 + if (callee_method->is_method_handle_invoke() || callee_method->is_method_handle_adapter())
1.18 return NULL;
1.19
1.20 // First check all inlining restrictions which are required for correctness
1.21 @@ -340,7 +340,7 @@
1.22 Bytecodes::Code call_bc = iter.cur_bc();
1.23 // An invokedynamic instruction does not have a klass.
1.24 if (call_bc != Bytecodes::_invokedynamic) {
1.25 - int index = iter.get_index_int();
1.26 + int index = iter.get_index_u2_cpcache();
1.27 if (!caller_method->is_klass_loaded(index, true)) {
1.28 return false;
1.29 }
