1.1 --- a/src/share/vm/prims/methodHandles.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/prims/methodHandles.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2008, 2012, 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 @@ -55,16 +55,16 @@
1.11 static void expand_MemberName(Handle mname, int suppress, TRAPS); // expand defc/name/type if missing
1.12 static Handle new_MemberName(TRAPS); // must be followed by init_MemberName
1.13 static oop init_MemberName(oop mname_oop, oop target_oop); // compute vmtarget/vmindex from target
1.14 - static oop init_method_MemberName(oop mname_oop, methodOop m, bool do_dispatch,
1.15 - klassOop receiver_limit);
1.16 - static oop init_field_MemberName(oop mname_oop, klassOop field_holder,
1.17 + static oop init_method_MemberName(oop mname_oop, Method* m, bool do_dispatch,
1.18 + Klass* receiver_limit);
1.19 + static oop init_field_MemberName(oop mname_oop, Klass* field_holder,
1.20 AccessFlags mods, oop type, oop name,
1.21 intptr_t offset, bool is_setter = false);
1.22 static Handle init_method_MemberName(oop mname_oop, CallInfo& info, TRAPS);
1.23 static Handle init_field_MemberName(oop mname_oop, FieldAccessInfo& info, TRAPS);
1.24 - static int method_ref_kind(methodOop m, bool do_dispatch_if_possible = true);
1.25 - static int find_MemberNames(klassOop k, Symbol* name, Symbol* sig,
1.26 - int mflags, klassOop caller,
1.27 + static int method_ref_kind(Method* m, bool do_dispatch_if_possible = true);
1.28 + static int find_MemberNames(Klass* k, Symbol* name, Symbol* sig,
1.29 + int mflags, Klass* caller,
1.30 int skip, objArrayOop results);
1.31 // bit values for suppress argument to expand_MemberName:
1.32 enum { _suppress_defc = 1, _suppress_name = 2, _suppress_type = 4 };
1.33 @@ -116,13 +116,13 @@
1.34 static Symbol* signature_polymorphic_intrinsic_name(vmIntrinsics::ID iid);
1.35 static int signature_polymorphic_intrinsic_ref_kind(vmIntrinsics::ID iid);
1.36
1.37 - static vmIntrinsics::ID signature_polymorphic_name_id(klassOop klass, Symbol* name);
1.38 + static vmIntrinsics::ID signature_polymorphic_name_id(Klass* klass, Symbol* name);
1.39 static vmIntrinsics::ID signature_polymorphic_name_id(Symbol* name);
1.40 static bool is_signature_polymorphic_name(Symbol* name) {
1.41 return signature_polymorphic_name_id(name) != vmIntrinsics::_none;
1.42 }
1.43 - static bool is_method_handle_invoke_name(klassOop klass, Symbol* name);
1.44 - static bool is_signature_polymorphic_name(klassOop klass, Symbol* name) {
1.45 + static bool is_method_handle_invoke_name(Klass* klass, Symbol* name);
1.46 + static bool is_signature_polymorphic_name(Klass* klass, Symbol* name) {
1.47 return signature_polymorphic_name_id(klass, name) != vmIntrinsics::_none;
1.48 }
1.49
