equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
219 methodOopDesc::is_method_handle_invoke_name(name)) { |
219 methodOopDesc::is_method_handle_invoke_name(name)) { |
220 if (!MethodHandles::enabled()) { |
220 if (!MethodHandles::enabled()) { |
221 // Make sure the Java part of the runtime has been booted up. |
221 // Make sure the Java part of the runtime has been booted up. |
222 klassOop natives = SystemDictionary::MethodHandleNatives_klass(); |
222 klassOop natives = SystemDictionary::MethodHandleNatives_klass(); |
223 if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) { |
223 if (natives == NULL || instanceKlass::cast(natives)->is_not_initialized()) { |
224 SystemDictionary::resolve_or_fail(vmSymbols::sun_dyn_MethodHandleNatives(), |
224 Symbol* natives_name = vmSymbols::java_dyn_MethodHandleNatives(); |
|
225 if (natives != NULL && AllowTransitionalJSR292) natives_name = Klass::cast(natives)->name(); |
|
226 SystemDictionary::resolve_or_fail(natives_name, |
225 Handle(), |
227 Handle(), |
226 Handle(), |
228 Handle(), |
227 true, |
229 true, |
228 CHECK); |
230 CHECK); |
229 } |
231 } |