author | rprotacio |
Wed, 17 Feb 2016 14:03:18 -0500 | |
changeset 36178 | 9739f8c767da |
parent 35606 | d873b64009cc |
child 36199 | 855b44ce93c0 |
permissions | -rw-r--r-- |
2534 | 1 |
/* |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35606
diff
changeset
|
2 |
* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved. |
2534 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
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 |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5421
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5421
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5421
diff
changeset
|
21 |
* questions. |
2534 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28374
diff
changeset
|
26 |
#include "classfile/javaClasses.inline.hpp" |
24426
0a69c8cdfca9
8038654: Separate SymbolTable and StringTable code
gziemski
parents:
22250
diff
changeset
|
27 |
#include "classfile/stringTable.hpp" |
28374
0558e321c027
8067836: The Universe::flush_foo methods belong in CodeCache.
coleenp
parents:
27694
diff
changeset
|
28 |
#include "code/codeCache.hpp" |
31620
53be635ad49c
8087333: Optionally Pre-Generate the HotSpot Template Interpreter
bdelsart
parents:
31592
diff
changeset
|
29 |
#include "code/codeCacheExtensions.hpp" |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
30 |
#include "code/dependencyContext.hpp" |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
10004
diff
changeset
|
31 |
#include "compiler/compileBroker.hpp" |
7397 | 32 |
#include "interpreter/interpreter.hpp" |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9638
diff
changeset
|
33 |
#include "interpreter/oopMapCache.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28374
diff
changeset
|
34 |
#include "interpreter/linkResolver.hpp" |
7397 | 35 |
#include "memory/allocation.inline.hpp" |
36 |
#include "memory/oopFactory.hpp" |
|
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28374
diff
changeset
|
37 |
#include "oops/objArrayOop.inline.hpp" |
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28374
diff
changeset
|
38 |
#include "oops/oop.inline.hpp" |
7397 | 39 |
#include "prims/methodHandles.hpp" |
30289
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
40 |
#include "prims/jvmtiRedefineClassesTrace.hpp" |
10008
d84de97ad847
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
10004
diff
changeset
|
41 |
#include "runtime/compilationPolicy.hpp" |
7397 | 42 |
#include "runtime/javaCalls.hpp" |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35606
diff
changeset
|
43 |
#include "runtime/logTimer.hpp" |
7397 | 44 |
#include "runtime/reflection.hpp" |
45 |
#include "runtime/signature.hpp" |
|
46 |
#include "runtime/stubRoutines.hpp" |
|
27420
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
47 |
#include "utilities/exceptions.hpp" |
7397 | 48 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
49 |
|
2534 | 50 |
/* |
51 |
* JSR 292 reference implementation: method handles |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
52 |
* The JDK 7 reference implementation represented method handle |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
53 |
* combinations as chains. Each link in the chain had a "vmentry" |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
54 |
* field which pointed at a bit of assembly code which performed |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
55 |
* one transformation before dispatching to the next link in the chain. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
56 |
* |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
57 |
* The current reference implementation pushes almost all code generation |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
58 |
* responsibility to (trusted) Java code. A method handle contains a |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
59 |
* pointer to its "LambdaForm", which embodies all details of the method |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
60 |
* handle's behavior. The LambdaForm is a normal Java object, managed |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
61 |
* by a runtime coded in Java. |
2534 | 62 |
*/ |
63 |
||
64 |
bool MethodHandles::_enabled = false; // set true after successful native linkage |
|
9976
6fef34e63df1
7045514: SPARC assembly code for JSR 292 ricochet frames
never
parents:
9967
diff
changeset
|
65 |
MethodHandlesAdapterBlob* MethodHandles::_adapter_code = NULL; |
5050
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
66 |
|
27420
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
67 |
|
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
68 |
/** |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
69 |
* Generates method handle adapters. Returns 'false' if memory allocation |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
70 |
* failed and true otherwise. |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
71 |
*/ |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
72 |
bool MethodHandles::generate_adapters() { |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
73 |
if (SystemDictionary::MethodHandle_klass() == NULL) { |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
74 |
return true; |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
75 |
} |
5050
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
76 |
|
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
77 |
assert(_adapter_code == NULL, "generate only once"); |
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
78 |
|
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
79 |
ResourceMark rm; |
36178
9739f8c767da
8148630: Convert TraceStartupTime to Unified Logging
rprotacio
parents:
35606
diff
changeset
|
80 |
TraceStartupTime timer("MethodHandles adapters generation"); |
9976
6fef34e63df1
7045514: SPARC assembly code for JSR 292 ricochet frames
never
parents:
9967
diff
changeset
|
81 |
_adapter_code = MethodHandlesAdapterBlob::create(adapter_code_size); |
27420
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
82 |
if (_adapter_code == NULL) { |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
83 |
return false; |
10983
9ab65f4cec18
7104960: JSR 292: +VerifyMethodHandles in product JVM can overflow buffer
never
parents:
10967
diff
changeset
|
84 |
} |
27420
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
85 |
|
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
86 |
CodeBuffer code(_adapter_code); |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
87 |
MethodHandlesAdapterGenerator g(&code); |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
88 |
g.generate(); |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
89 |
code.log_section_sizes("MethodHandlesAdapterBlob"); |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
90 |
return true; |
5050
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
91 |
} |
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
92 |
|
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
93 |
//------------------------------------------------------------------------------ |
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
94 |
// MethodHandlesAdapterGenerator::generate |
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
95 |
// |
7887
7aa0354cbf25
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
7712
diff
changeset
|
96 |
void MethodHandlesAdapterGenerator::generate() { |
5050
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
97 |
// Generate generic method handle adapters. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
98 |
// Generate interpreter entries |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
99 |
for (Interpreter::MethodKind mk = Interpreter::method_handle_invoke_FIRST; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
100 |
mk <= Interpreter::method_handle_invoke_LAST; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
101 |
mk = Interpreter::MethodKind(1 + (int)mk)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
102 |
vmIntrinsics::ID iid = Interpreter::method_handle_intrinsic(mk); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
103 |
StubCodeMark mark(this, "MethodHandle::interpreter_entry", vmIntrinsics::name_at(iid)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
104 |
address entry = MethodHandles::generate_method_handle_interpreter_entry(_masm, iid); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
105 |
if (entry != NULL) { |
31620
53be635ad49c
8087333: Optionally Pre-Generate the HotSpot Template Interpreter
bdelsart
parents:
31592
diff
changeset
|
106 |
CodeCacheExtensions::handle_generated_pc(entry, vmIntrinsics::name_at(iid)); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
107 |
Interpreter::set_entry_for_kind(mk, entry); |
9630
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
108 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
109 |
// If the entry is not set, it will throw AbstractMethodError. |
5050
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
110 |
} |
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
111 |
} |
47ecd86932ce
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
4571
diff
changeset
|
112 |
|
2534 | 113 |
void MethodHandles::set_enabled(bool z) { |
114 |
if (_enabled != z) { |
|
24322 | 115 |
guarantee(z, "can only enable once"); |
2534 | 116 |
_enabled = z; |
117 |
} |
|
118 |
} |
|
119 |
||
120 |
// MemberName support |
|
121 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
122 |
// import java_lang_invoke_MemberName.* |
2534 | 123 |
enum { |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
124 |
IS_METHOD = java_lang_invoke_MemberName::MN_IS_METHOD, |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
125 |
IS_CONSTRUCTOR = java_lang_invoke_MemberName::MN_IS_CONSTRUCTOR, |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
126 |
IS_FIELD = java_lang_invoke_MemberName::MN_IS_FIELD, |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
127 |
IS_TYPE = java_lang_invoke_MemberName::MN_IS_TYPE, |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
128 |
CALLER_SENSITIVE = java_lang_invoke_MemberName::MN_CALLER_SENSITIVE, |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
129 |
REFERENCE_KIND_SHIFT = java_lang_invoke_MemberName::MN_REFERENCE_KIND_SHIFT, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
130 |
REFERENCE_KIND_MASK = java_lang_invoke_MemberName::MN_REFERENCE_KIND_MASK, |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
131 |
SEARCH_SUPERCLASSES = java_lang_invoke_MemberName::MN_SEARCH_SUPERCLASSES, |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
132 |
SEARCH_INTERFACES = java_lang_invoke_MemberName::MN_SEARCH_INTERFACES, |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
133 |
ALL_KINDS = IS_METHOD | IS_CONSTRUCTOR | IS_FIELD | IS_TYPE |
2534 | 134 |
}; |
135 |
||
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
136 |
Handle MethodHandles::new_MemberName(TRAPS) { |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
137 |
Handle empty; |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
138 |
instanceKlassHandle k(THREAD, SystemDictionary::MemberName_klass()); |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
139 |
if (!k->is_initialized()) k->initialize(CHECK_(empty)); |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
140 |
return Handle(THREAD, k->allocate_instance(THREAD)); |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
141 |
} |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
142 |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
143 |
oop MethodHandles::init_MemberName(Handle mname, Handle target) { |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
144 |
// This method is used from java.lang.invoke.MemberName constructors. |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
145 |
// It fills in the new MemberName from a java.lang.reflect.Member. |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
146 |
Thread* thread = Thread::current(); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
147 |
oop target_oop = target(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
148 |
Klass* target_klass = target_oop->klass(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
149 |
if (target_klass == SystemDictionary::reflect_Field_klass()) { |
2534 | 150 |
oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder() |
151 |
int slot = java_lang_reflect_Field::slot(target_oop); // fd.index() |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
152 |
KlassHandle k(thread, java_lang_Class::as_Klass(clazz)); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
153 |
if (!k.is_null() && k->is_instance_klass()) { |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
154 |
fieldDescriptor fd(InstanceKlass::cast(k()), slot); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
155 |
oop mname2 = init_field_MemberName(mname, fd); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
156 |
if (mname2 != NULL) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
157 |
// Since we have the reified name and type handy, add them to the result. |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
158 |
if (java_lang_invoke_MemberName::name(mname2) == NULL) |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
159 |
java_lang_invoke_MemberName::set_name(mname2, java_lang_reflect_Field::name(target_oop)); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
160 |
if (java_lang_invoke_MemberName::type(mname2) == NULL) |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
161 |
java_lang_invoke_MemberName::set_type(mname2, java_lang_reflect_Field::type(target_oop)); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
162 |
} |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
163 |
return mname2; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
164 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
165 |
} else if (target_klass == SystemDictionary::reflect_Method_klass()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
166 |
oop clazz = java_lang_reflect_Method::clazz(target_oop); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
167 |
int slot = java_lang_reflect_Method::slot(target_oop); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
168 |
KlassHandle k(thread, java_lang_Class::as_Klass(clazz)); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
169 |
if (!k.is_null() && k->is_instance_klass()) { |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
170 |
Method* m = InstanceKlass::cast(k())->method_with_idnum(slot); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
171 |
if (m == NULL || is_signature_polymorphic(m->intrinsic_id())) |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
172 |
return NULL; // do not resolve unless there is a concrete signature |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
173 |
CallInfo info(m, k()); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
174 |
return init_method_MemberName(mname, info); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
175 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
176 |
} else if (target_klass == SystemDictionary::reflect_Constructor_klass()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
177 |
oop clazz = java_lang_reflect_Constructor::clazz(target_oop); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
178 |
int slot = java_lang_reflect_Constructor::slot(target_oop); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
179 |
KlassHandle k(thread, java_lang_Class::as_Klass(clazz)); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
180 |
if (!k.is_null() && k->is_instance_klass()) { |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
181 |
Method* m = InstanceKlass::cast(k())->method_with_idnum(slot); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
182 |
if (m == NULL) return NULL; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
183 |
CallInfo info(m, k()); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
184 |
return init_method_MemberName(mname, info); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
185 |
} |
2534 | 186 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
187 |
return NULL; |
2534 | 188 |
} |
189 |
||
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
190 |
oop MethodHandles::init_method_MemberName(Handle mname, CallInfo& info) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
191 |
assert(info.resolved_appendix().is_null(), "only normal methods here"); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
192 |
methodHandle m = info.resolved_method(); |
30615
4713e7c7b96f
8030680: 292 cleanup from default method code assessment
acorn
parents:
30310
diff
changeset
|
193 |
assert(m.not_null(), "null method handle"); |
22250 | 194 |
KlassHandle m_klass = m->method_holder(); |
30615
4713e7c7b96f
8030680: 292 cleanup from default method code assessment
acorn
parents:
30310
diff
changeset
|
195 |
assert(m.not_null(), "null holder for method handle"); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
196 |
int flags = (jushort)( m->access_flags().as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS ); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
197 |
int vmindex = Method::invalid_vtable_index; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
198 |
|
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
199 |
switch (info.call_kind()) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
200 |
case CallInfo::itable_call: |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
201 |
vmindex = info.itable_index(); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
202 |
// More importantly, the itable index only works with the method holder. |
22250 | 203 |
assert(m_klass->verify_itable_index(vmindex), ""); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
204 |
flags |= IS_METHOD | (JVM_REF_invokeInterface << REFERENCE_KIND_SHIFT); |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
205 |
if (TraceInvokeDynamic) { |
35543
0961315f4016
8140659: C1: invokedynamic call patching violates JVMS-6.5.invokedynamic
vlivanov
parents:
35086
diff
changeset
|
206 |
ttyLocker ttyl; |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
207 |
ResourceMark rm; |
22250 | 208 |
tty->print_cr("memberName: invokeinterface method_holder::method: %s, itableindex: %d, access_flags:", |
209 |
Method::name_and_sig_as_C_string(m->method_holder(), m->name(), m->signature()), |
|
210 |
vmindex); |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
211 |
m->access_flags().print_on(tty); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
212 |
if (!m->is_abstract()) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
213 |
tty->print("default"); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
214 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
215 |
tty->cr(); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
216 |
} |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
217 |
break; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
218 |
|
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
219 |
case CallInfo::vtable_call: |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
220 |
vmindex = info.vtable_index(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
221 |
flags |= IS_METHOD | (JVM_REF_invokeVirtual << REFERENCE_KIND_SHIFT); |
22250 | 222 |
assert(info.resolved_klass()->is_subtype_of(m_klass()), "virtual call must be type-safe"); |
223 |
if (m_klass->is_interface()) { |
|
224 |
// This is a vtable call to an interface method (abstract "miranda method" or default method). |
|
225 |
// The vtable index is meaningless without a class (not interface) receiver type, so get one. |
|
226 |
// (LinkResolver should help us figure this out.) |
|
227 |
KlassHandle m_klass_non_interface = info.resolved_klass(); |
|
228 |
if (m_klass_non_interface->is_interface()) { |
|
229 |
m_klass_non_interface = SystemDictionary::Object_klass(); |
|
230 |
#ifdef ASSERT |
|
231 |
{ ResourceMark rm; |
|
232 |
Method* m2 = m_klass_non_interface->vtable()->method_at(vmindex); |
|
233 |
assert(m->name() == m2->name() && m->signature() == m2->signature(), |
|
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31620
diff
changeset
|
234 |
"at %d, %s != %s", vmindex, |
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31620
diff
changeset
|
235 |
m->name_and_sig_as_C_string(), m2->name_and_sig_as_C_string()); |
22250 | 236 |
} |
237 |
#endif //ASSERT |
|
238 |
} |
|
239 |
if (!m->is_public()) { |
|
240 |
assert(m->is_public(), "virtual call must be to public interface method"); |
|
241 |
return NULL; // elicit an error later in product build |
|
242 |
} |
|
243 |
assert(info.resolved_klass()->is_subtype_of(m_klass_non_interface()), "virtual call must be type-safe"); |
|
244 |
m_klass = m_klass_non_interface; |
|
245 |
} |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
246 |
if (TraceInvokeDynamic) { |
35543
0961315f4016
8140659: C1: invokedynamic call patching violates JVMS-6.5.invokedynamic
vlivanov
parents:
35086
diff
changeset
|
247 |
ttyLocker ttyl; |
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
248 |
ResourceMark rm; |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
249 |
tty->print_cr("memberName: invokevirtual method_holder::method: %s, receiver: %s, vtableindex: %d, access_flags:", |
22250 | 250 |
Method::name_and_sig_as_C_string(m->method_holder(), m->name(), m->signature()), |
251 |
m_klass->internal_name(), vmindex); |
|
20391
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
252 |
m->access_flags().print_on(tty); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
253 |
if (m->is_default_method()) { |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
254 |
tty->print("default"); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
255 |
} |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
256 |
tty->cr(); |
7b146c5ebb18
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
20017
diff
changeset
|
257 |
} |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
258 |
break; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
259 |
|
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
260 |
case CallInfo::direct_call: |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
261 |
vmindex = Method::nonvirtual_vtable_index; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
262 |
if (m->is_static()) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
263 |
flags |= IS_METHOD | (JVM_REF_invokeStatic << REFERENCE_KIND_SHIFT); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
264 |
} else if (m->is_initializer()) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
265 |
flags |= IS_CONSTRUCTOR | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
266 |
} else { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
267 |
flags |= IS_METHOD | (JVM_REF_invokeSpecial << REFERENCE_KIND_SHIFT); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
268 |
} |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
269 |
break; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
270 |
|
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
271 |
default: assert(false, "bad CallInfo"); return NULL; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
272 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
273 |
|
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
274 |
// @CallerSensitive annotation detected |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
275 |
if (m->caller_sensitive()) { |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
276 |
flags |= CALLER_SENSITIVE; |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
277 |
} |
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
278 |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
279 |
oop mname_oop = mname(); |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
280 |
java_lang_invoke_MemberName::set_flags( mname_oop, flags); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
281 |
java_lang_invoke_MemberName::set_vmtarget(mname_oop, m()); |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
282 |
java_lang_invoke_MemberName::set_vmindex( mname_oop, vmindex); // vtable/itable index |
22250 | 283 |
java_lang_invoke_MemberName::set_clazz( mname_oop, m_klass->java_mirror()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
284 |
// Note: name and type can be lazily computed by resolve_MemberName, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
285 |
// if Java code needs them as resolved String and MethodType objects. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
286 |
// The clazz must be eagerly stored, because it provides a GC |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
287 |
// root to help keep alive the Method*. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
288 |
// If relevant, the vtable or itable value is stored as vmindex. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
289 |
// This is done eagerly, since it is readily available without |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
290 |
// constructing any new objects. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
291 |
// TO DO: maybe intern mname_oop |
27674
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
292 |
if (m->method_holder()->add_member_name(mname)) { |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
293 |
return mname(); |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
294 |
} else { |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
295 |
// Redefinition caused this to fail. Return NULL (and an exception?) |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
296 |
return NULL; |
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
297 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
298 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
299 |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
300 |
oop MethodHandles::init_field_MemberName(Handle mname, fieldDescriptor& fd, bool is_setter) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
301 |
int flags = (jushort)( fd.access_flags().as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS ); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
302 |
flags |= IS_FIELD | ((fd.is_static() ? JVM_REF_getStatic : JVM_REF_getField) << REFERENCE_KIND_SHIFT); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
303 |
if (is_setter) flags += ((JVM_REF_putField - JVM_REF_getField) << REFERENCE_KIND_SHIFT); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
304 |
Metadata* vmtarget = fd.field_holder(); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
305 |
int vmindex = fd.offset(); // determines the field uniquely when combined with static bit |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
306 |
oop mname_oop = mname(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
307 |
java_lang_invoke_MemberName::set_flags(mname_oop, flags); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
308 |
java_lang_invoke_MemberName::set_vmtarget(mname_oop, vmtarget); |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
309 |
java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
310 |
java_lang_invoke_MemberName::set_clazz(mname_oop, fd.field_holder()->java_mirror()); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
311 |
oop type = field_signature_type_or_null(fd.signature()); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
312 |
oop name = field_name_or_null(fd.name()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
313 |
if (name != NULL) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
314 |
java_lang_invoke_MemberName::set_name(mname_oop, name); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
315 |
if (type != NULL) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
316 |
java_lang_invoke_MemberName::set_type(mname_oop, type); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
317 |
// Note: name and type can be lazily computed by resolve_MemberName, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
318 |
// if Java code needs them as resolved String and Class objects. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
319 |
// Note that the incoming type oop might be pre-resolved (non-null). |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
320 |
// The base clazz and field offset (vmindex) must be eagerly stored, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
321 |
// because they unambiguously identify the field. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
322 |
// Although the fieldDescriptor::_index would also identify the field, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
323 |
// we do not use it, because it is harder to decode. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
324 |
// TO DO: maybe intern mname_oop |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
325 |
return mname(); |
2534 | 326 |
} |
327 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
328 |
// JVM 2.9 Special Methods: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
329 |
// A method is signature polymorphic if and only if all of the following conditions hold : |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
330 |
// * It is declared in the java.lang.invoke.MethodHandle class. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
331 |
// * It has a single formal parameter of type Object[]. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
332 |
// * It has a return type of Object. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
333 |
// * It has the ACC_VARARGS and ACC_NATIVE flags set. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
334 |
bool MethodHandles::is_method_handle_invoke_name(Klass* klass, Symbol* name) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
335 |
if (klass == NULL) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
336 |
return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
337 |
// The following test will fail spuriously during bootstrap of MethodHandle itself: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
338 |
// if (klass != SystemDictionary::MethodHandle_klass()) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
339 |
// Test the name instead: |
14488 | 340 |
if (klass->name() != vmSymbols::java_lang_invoke_MethodHandle()) |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
341 |
return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
342 |
Symbol* poly_sig = vmSymbols::object_array_object_signature(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
343 |
Method* m = InstanceKlass::cast(klass)->find_method(name, poly_sig); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
344 |
if (m == NULL) return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
345 |
int required = JVM_ACC_NATIVE | JVM_ACC_VARARGS; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
346 |
int flags = m->access_flags().as_int(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
347 |
return (flags & required) == required; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
348 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
349 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
350 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
351 |
Symbol* MethodHandles::signature_polymorphic_intrinsic_name(vmIntrinsics::ID iid) { |
33198 | 352 |
assert(is_signature_polymorphic_intrinsic(iid), "%d %s", iid, vmIntrinsics::name_at(iid)); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
353 |
switch (iid) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
354 |
case vmIntrinsics::_invokeBasic: return vmSymbols::invokeBasic_name(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
355 |
case vmIntrinsics::_linkToVirtual: return vmSymbols::linkToVirtual_name(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
356 |
case vmIntrinsics::_linkToStatic: return vmSymbols::linkToStatic_name(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
357 |
case vmIntrinsics::_linkToSpecial: return vmSymbols::linkToSpecial_name(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
358 |
case vmIntrinsics::_linkToInterface: return vmSymbols::linkToInterface_name(); |
4094
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
359 |
} |
33198 | 360 |
fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid)); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
361 |
return 0; |
2534 | 362 |
} |
363 |
||
35086
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
364 |
Bytecodes::Code MethodHandles::signature_polymorphic_intrinsic_bytecode(vmIntrinsics::ID id) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
365 |
switch(id) { |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
366 |
case vmIntrinsics::_linkToVirtual: return Bytecodes::_invokevirtual; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
367 |
case vmIntrinsics::_linkToInterface: return Bytecodes::_invokeinterface; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
368 |
case vmIntrinsics::_linkToStatic: return Bytecodes::_invokestatic; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
369 |
case vmIntrinsics::_linkToSpecial: return Bytecodes::_invokespecial; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
370 |
case vmIntrinsics::_invokeBasic: return Bytecodes::_invokehandle; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
371 |
default: |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
372 |
fatal("unexpected id: (%d) %s", (uint)id, vmIntrinsics::name_at(id)); |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
373 |
return Bytecodes::_illegal; |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
374 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
375 |
} |
bbf32241d851
8072008: Emit direct call instead of linkTo* for recursive indy/MH.invoke* calls
vlivanov
parents:
34317
diff
changeset
|
376 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
377 |
int MethodHandles::signature_polymorphic_intrinsic_ref_kind(vmIntrinsics::ID iid) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
378 |
switch (iid) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
379 |
case vmIntrinsics::_invokeBasic: return 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
380 |
case vmIntrinsics::_linkToVirtual: return JVM_REF_invokeVirtual; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
381 |
case vmIntrinsics::_linkToStatic: return JVM_REF_invokeStatic; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
382 |
case vmIntrinsics::_linkToSpecial: return JVM_REF_invokeSpecial; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
383 |
case vmIntrinsics::_linkToInterface: return JVM_REF_invokeInterface; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
384 |
} |
33198 | 385 |
fatal("unexpected intrinsic id: %d %s", iid, vmIntrinsics::name_at(iid)); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
386 |
return 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
387 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
388 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
389 |
vmIntrinsics::ID MethodHandles::signature_polymorphic_name_id(Symbol* name) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
390 |
vmSymbols::SID name_id = vmSymbols::find_sid(name); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
391 |
switch (name_id) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
392 |
// The ID _invokeGeneric stands for all non-static signature-polymorphic methods, except built-ins. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
393 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(invoke_name): return vmIntrinsics::_invokeGeneric; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
394 |
// The only built-in non-static signature-polymorphic method is MethodHandle.invokeBasic: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
395 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(invokeBasic_name): return vmIntrinsics::_invokeBasic; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
396 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
397 |
// There is one static signature-polymorphic method for each JVM invocation mode. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
398 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToVirtual_name): return vmIntrinsics::_linkToVirtual; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
399 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToStatic_name): return vmIntrinsics::_linkToStatic; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
400 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToSpecial_name): return vmIntrinsics::_linkToSpecial; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
401 |
case vmSymbols::VM_SYMBOL_ENUM_NAME(linkToInterface_name): return vmIntrinsics::_linkToInterface; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
402 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
403 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
404 |
// Cover the case of invokeExact and any future variants of invokeFoo. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
405 |
Klass* mh_klass = SystemDictionary::well_known_klass( |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
406 |
SystemDictionary::WK_KLASS_ENUM_NAME(MethodHandle_klass) ); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
407 |
if (mh_klass != NULL && is_method_handle_invoke_name(mh_klass, name)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
408 |
return vmIntrinsics::_invokeGeneric; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
409 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
410 |
// Note: The pseudo-intrinsic _compiledLambdaForm is never linked against. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
411 |
// Instead it is used to mark lambda forms bound to invokehandle or invokedynamic. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
412 |
return vmIntrinsics::_none; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
413 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
414 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
415 |
vmIntrinsics::ID MethodHandles::signature_polymorphic_name_id(Klass* klass, Symbol* name) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
416 |
if (klass != NULL && |
14488 | 417 |
klass->name() == vmSymbols::java_lang_invoke_MethodHandle()) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
418 |
vmIntrinsics::ID iid = signature_polymorphic_name_id(name); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
419 |
if (iid != vmIntrinsics::_none) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
420 |
return iid; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
421 |
if (is_method_handle_invoke_name(klass, name)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
422 |
return vmIntrinsics::_invokeGeneric; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
423 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
424 |
return vmIntrinsics::_none; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
425 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
426 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
427 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
428 |
// convert the external string or reflective type to an internal signature |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
429 |
Symbol* MethodHandles::lookup_signature(oop type_str, bool intern_if_not_found, TRAPS) { |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
430 |
if (java_lang_invoke_MethodType::is_instance(type_str)) { |
27680
8ecc0871c18e
8064811: Use THREAD instead of CHECK_NULL in return statements
stefank
parents:
27420
diff
changeset
|
431 |
return java_lang_invoke_MethodType::as_signature(type_str, intern_if_not_found, THREAD); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
432 |
} else if (java_lang_Class::is_instance(type_str)) { |
27680
8ecc0871c18e
8064811: Use THREAD instead of CHECK_NULL in return statements
stefank
parents:
27420
diff
changeset
|
433 |
return java_lang_Class::as_signature(type_str, false, THREAD); |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
28374
diff
changeset
|
434 |
} else if (java_lang_String::is_instance_inlined(type_str)) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
435 |
if (intern_if_not_found) { |
27680
8ecc0871c18e
8064811: Use THREAD instead of CHECK_NULL in return statements
stefank
parents:
27420
diff
changeset
|
436 |
return java_lang_String::as_symbol(type_str, THREAD); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
437 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
438 |
return java_lang_String::as_symbol_or_null(type_str); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
439 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
440 |
} else { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
441 |
THROW_MSG_(vmSymbols::java_lang_InternalError(), "unrecognized type", NULL); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
442 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
443 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
444 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
445 |
static const char OBJ_SIG[] = "Ljava/lang/Object;"; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
446 |
enum { OBJ_SIG_LEN = 18 }; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
447 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
448 |
bool MethodHandles::is_basic_type_signature(Symbol* sig) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
449 |
assert(vmSymbols::object_signature()->utf8_length() == (int)OBJ_SIG_LEN, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
450 |
assert(vmSymbols::object_signature()->equals(OBJ_SIG), ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
451 |
const int len = sig->utf8_length(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
452 |
for (int i = 0; i < len; i++) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
453 |
switch (sig->byte_at(i)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
454 |
case 'L': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
455 |
// only java/lang/Object is valid here |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
456 |
if (sig->index_of_at(i, OBJ_SIG, OBJ_SIG_LEN) != i) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
457 |
return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
458 |
i += OBJ_SIG_LEN-1; //-1 because of i++ in loop |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
459 |
continue; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
460 |
case '(': case ')': case 'V': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
461 |
case 'I': case 'J': case 'F': case 'D': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
462 |
continue; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
463 |
//case '[': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
464 |
//case 'Z': case 'B': case 'C': case 'S': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
465 |
default: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
466 |
return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
467 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
468 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
469 |
return true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
470 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
471 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
472 |
Symbol* MethodHandles::lookup_basic_type_signature(Symbol* sig, bool keep_last_arg, TRAPS) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
473 |
Symbol* bsig = NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
474 |
if (sig == NULL) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
475 |
return sig; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
476 |
} else if (is_basic_type_signature(sig)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
477 |
sig->increment_refcount(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
478 |
return sig; // that was easy |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
479 |
} else if (sig->byte_at(0) != '(') { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
480 |
BasicType bt = char2type(sig->byte_at(0)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
481 |
if (is_subword_type(bt)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
482 |
bsig = vmSymbols::int_signature(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
483 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
484 |
assert(bt == T_OBJECT || bt == T_ARRAY, "is_basic_type_signature was false"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
485 |
bsig = vmSymbols::object_signature(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
486 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
487 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
488 |
ResourceMark rm; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
489 |
stringStream buffer(128); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
490 |
buffer.put('('); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
491 |
int arg_pos = 0, keep_arg_pos = -1; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
492 |
if (keep_last_arg) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
493 |
keep_arg_pos = ArgumentCount(sig).size() - 1; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
494 |
for (SignatureStream ss(sig); !ss.is_done(); ss.next()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
495 |
BasicType bt = ss.type(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
496 |
size_t this_arg_pos = buffer.size(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
497 |
if (ss.at_return_type()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
498 |
buffer.put(')'); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
499 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
500 |
if (arg_pos == keep_arg_pos) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
501 |
buffer.write((char*) ss.raw_bytes(), |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
502 |
(int) ss.raw_length()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
503 |
} else if (bt == T_OBJECT || bt == T_ARRAY) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
504 |
buffer.write(OBJ_SIG, OBJ_SIG_LEN); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
505 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
506 |
if (is_subword_type(bt)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
507 |
bt = T_INT; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
508 |
buffer.put(type2char(bt)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
509 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
510 |
arg_pos++; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
511 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
512 |
const char* sigstr = buffer.base(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
513 |
int siglen = (int) buffer.size(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
514 |
bsig = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
515 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
516 |
assert(is_basic_type_signature(bsig) || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
517 |
// detune assert in case the injected argument is not a basic type: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
518 |
keep_last_arg, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
519 |
return bsig; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
520 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
521 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
522 |
void MethodHandles::print_as_basic_type_signature_on(outputStream* st, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
523 |
Symbol* sig, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
524 |
bool keep_arrays, |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
525 |
bool keep_basic_names) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
526 |
st = st ? st : tty; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
527 |
int len = sig->utf8_length(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
528 |
int array = 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
529 |
bool prev_type = false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
530 |
for (int i = 0; i < len; i++) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
531 |
char ch = sig->byte_at(i); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
532 |
switch (ch) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
533 |
case '(': case ')': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
534 |
prev_type = false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
535 |
st->put(ch); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
536 |
continue; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
537 |
case '[': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
538 |
if (!keep_basic_names && keep_arrays) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
539 |
st->put(ch); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
540 |
array++; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
541 |
continue; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
542 |
case 'L': |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
543 |
{ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
544 |
if (prev_type) st->put(','); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
545 |
int start = i+1, slash = start; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
546 |
while (++i < len && (ch = sig->byte_at(i)) != ';') { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
547 |
if (ch == '/' || ch == '.' || ch == '$') slash = i+1; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
548 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
549 |
if (slash < i) start = slash; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
550 |
if (!keep_basic_names) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
551 |
st->put('L'); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
552 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
553 |
for (int j = start; j < i; j++) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
554 |
st->put(sig->byte_at(j)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
555 |
prev_type = true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
556 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
557 |
break; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
558 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
559 |
default: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
560 |
{ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
561 |
if (array && char2type(ch) != T_ILLEGAL && !keep_arrays) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
562 |
ch = '['; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
563 |
array = 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
564 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
565 |
if (prev_type) st->put(','); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
566 |
const char* n = NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
567 |
if (keep_basic_names) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
568 |
n = type2name(char2type(ch)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
569 |
if (n == NULL) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
570 |
// unknown letter, or we don't want to know its name |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
571 |
st->put(ch); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
572 |
} else { |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
24322
diff
changeset
|
573 |
st->print("%s", n); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
574 |
prev_type = true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
575 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
576 |
break; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
577 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
578 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
579 |
// Switch break goes here to take care of array suffix: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
580 |
if (prev_type) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
581 |
while (array > 0) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
582 |
st->print("[]"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
583 |
--array; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
584 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
585 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
586 |
array = 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
587 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
588 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
589 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
590 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
591 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
592 |
static oop object_java_mirror() { |
14488 | 593 |
return SystemDictionary::Object_klass()->java_mirror(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
594 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
595 |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
596 |
oop MethodHandles::field_name_or_null(Symbol* s) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
597 |
if (s == NULL) return NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
598 |
return StringTable::lookup(s); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
599 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
600 |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
601 |
oop MethodHandles::field_signature_type_or_null(Symbol* s) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
602 |
if (s == NULL) return NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
603 |
BasicType bt = FieldType::basic_type(s); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
604 |
if (is_java_primitive(bt)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
605 |
assert(s->utf8_length() == 1, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
606 |
return java_lang_Class::primitive_mirror(bt); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
607 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
608 |
// Here are some more short cuts for common types. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
609 |
// They are optional, since reference types can be resolved lazily. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
610 |
if (bt == T_OBJECT) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
611 |
if (s == vmSymbols::object_signature()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
612 |
return object_java_mirror(); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
613 |
} else if (s == vmSymbols::class_signature()) { |
14488 | 614 |
return SystemDictionary::Class_klass()->java_mirror(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
615 |
} else if (s == vmSymbols::string_signature()) { |
14488 | 616 |
return SystemDictionary::String_klass()->java_mirror(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
617 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
618 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
619 |
return NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
620 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
621 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
622 |
|
2534 | 623 |
// An unresolved member name is a mere symbolic reference. |
624 |
// Resolving it plants a vmtarget/vmindex in it, |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
625 |
// which refers directly to JVM internals. |
22250 | 626 |
Handle MethodHandles::resolve_MemberName(Handle mname, KlassHandle caller, TRAPS) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
627 |
Handle empty; |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
628 |
assert(java_lang_invoke_MemberName::is_instance(mname()), ""); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
629 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
630 |
if (java_lang_invoke_MemberName::vmtarget(mname()) != NULL) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
631 |
// Already resolved. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
632 |
DEBUG_ONLY(int vmindex = java_lang_invoke_MemberName::vmindex(mname())); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
633 |
assert(vmindex >= Method::nonvirtual_vtable_index, ""); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
634 |
return mname; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
635 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
636 |
|
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
637 |
Handle defc_oop(THREAD, java_lang_invoke_MemberName::clazz(mname())); |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
638 |
Handle name_str(THREAD, java_lang_invoke_MemberName::name( mname())); |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
639 |
Handle type_str(THREAD, java_lang_invoke_MemberName::type( mname())); |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
640 |
int flags = java_lang_invoke_MemberName::flags(mname()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
641 |
int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
642 |
if (!ref_kind_is_valid(ref_kind)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
643 |
THROW_MSG_(vmSymbols::java_lang_InternalError(), "obsolete MemberName format", empty); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
644 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
645 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
646 |
DEBUG_ONLY(int old_vmindex); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
647 |
assert((old_vmindex = java_lang_invoke_MemberName::vmindex(mname())) == 0, "clean input"); |
2534 | 648 |
|
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
649 |
if (defc_oop.is_null() || name_str.is_null() || type_str.is_null()) { |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
650 |
THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), "nothing to resolve", empty); |
2534 | 651 |
} |
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
652 |
|
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
653 |
instanceKlassHandle defc; |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
654 |
{ |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
655 |
Klass* defc_klass = java_lang_Class::as_Klass(defc_oop()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
656 |
if (defc_klass == NULL) return empty; // a primitive; no resolution possible |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
657 |
if (!defc_klass->is_instance_klass()) { |
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
658 |
if (!defc_klass->is_array_klass()) return empty; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
659 |
defc_klass = SystemDictionary::Object_klass(); |
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
660 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
661 |
defc = instanceKlassHandle(THREAD, defc_klass); |
2534 | 662 |
} |
663 |
if (defc.is_null()) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
664 |
THROW_MSG_(vmSymbols::java_lang_InternalError(), "primitive class", empty); |
2534 | 665 |
} |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
666 |
defc->link_class(CHECK_(empty)); // possible safepoint |
2534 | 667 |
|
668 |
// convert the external string name to an internal symbol |
|
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
669 |
TempNewSymbol name = java_lang_String::as_symbol_or_null(name_str()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
670 |
if (name == NULL) return empty; // no such name |
10004
190e88f7edd1
7055355: JSR 292: crash while throwing WrongMethodTypeException
never
parents:
9980
diff
changeset
|
671 |
if (name == vmSymbols::class_initializer_name()) |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
672 |
return empty; // illegal name |
2534 | 673 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
674 |
vmIntrinsics::ID mh_invoke_id = vmIntrinsics::_none; |
5421
e294db54fc0d
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
5420
diff
changeset
|
675 |
if ((flags & ALL_KINDS) == IS_METHOD && |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
676 |
(defc() == SystemDictionary::MethodHandle_klass()) && |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
677 |
(ref_kind == JVM_REF_invokeVirtual || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
678 |
ref_kind == JVM_REF_invokeSpecial || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
679 |
// static invocation mode is required for _linkToVirtual, etc.: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
680 |
ref_kind == JVM_REF_invokeStatic)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
681 |
vmIntrinsics::ID iid = signature_polymorphic_name_id(name); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
682 |
if (iid != vmIntrinsics::_none && |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
683 |
((ref_kind == JVM_REF_invokeStatic) == is_signature_polymorphic_static(iid))) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
684 |
// Virtual methods invoke and invokeExact, plus internal invokers like _invokeBasic. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
685 |
// For a static reference it could an internal linkage routine like _linkToVirtual, etc. |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
686 |
mh_invoke_id = iid; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
687 |
} |
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
688 |
} |
5421
e294db54fc0d
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
5420
diff
changeset
|
689 |
|
2534 | 690 |
// convert the external string or reflective type to an internal signature |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
691 |
TempNewSymbol type = lookup_signature(type_str(), (mh_invoke_id != vmIntrinsics::_none), CHECK_(empty)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
692 |
if (type == NULL) return empty; // no such signature exists in the VM |
2534 | 693 |
|
694 |
// Time to do the lookup. |
|
695 |
switch (flags & ALL_KINDS) { |
|
696 |
case IS_METHOD: |
|
697 |
{ |
|
698 |
CallInfo result; |
|
34238 | 699 |
LinkInfo link_info(defc, name, type, caller, caller.not_null()); |
2534 | 700 |
{ |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
701 |
assert(!HAS_PENDING_EXCEPTION, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
702 |
if (ref_kind == JVM_REF_invokeStatic) { |
2534 | 703 |
LinkResolver::resolve_static_call(result, |
31019 | 704 |
link_info, false, THREAD); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
705 |
} else if (ref_kind == JVM_REF_invokeInterface) { |
2534 | 706 |
LinkResolver::resolve_interface_call(result, Handle(), defc, |
31019 | 707 |
link_info, false, THREAD); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
708 |
} else if (mh_invoke_id != vmIntrinsics::_none) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
709 |
assert(!is_signature_polymorphic_static(mh_invoke_id), ""); |
31019 | 710 |
LinkResolver::resolve_handle_call(result, link_info, THREAD); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
711 |
} else if (ref_kind == JVM_REF_invokeSpecial) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
712 |
LinkResolver::resolve_special_call(result, |
31019 | 713 |
link_info, THREAD); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
714 |
} else if (ref_kind == JVM_REF_invokeVirtual) { |
2534 | 715 |
LinkResolver::resolve_virtual_call(result, Handle(), defc, |
31019 | 716 |
link_info, false, THREAD); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
717 |
} else { |
33105
294e48b4f704
8080775: Better argument formatting for assert() and friends
david
parents:
31620
diff
changeset
|
718 |
assert(false, "ref_kind=%d", ref_kind); |
2534 | 719 |
} |
720 |
if (HAS_PENDING_EXCEPTION) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
721 |
return empty; |
2534 | 722 |
} |
723 |
} |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
724 |
if (result.resolved_appendix().not_null()) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
725 |
// The resolved MemberName must not be accompanied by an appendix argument, |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
726 |
// since there is no way to bind this value into the MemberName. |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
727 |
// Caller is responsible to prevent this from happening. |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
728 |
THROW_MSG_(vmSymbols::java_lang_InternalError(), "appendix", empty); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
729 |
} |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
730 |
oop mname2 = init_method_MemberName(mname, result); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
731 |
return Handle(THREAD, mname2); |
2534 | 732 |
} |
733 |
case IS_CONSTRUCTOR: |
|
734 |
{ |
|
735 |
CallInfo result; |
|
34238 | 736 |
LinkInfo link_info(defc, name, type, caller, caller.not_null()); |
2534 | 737 |
{ |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
738 |
assert(!HAS_PENDING_EXCEPTION, ""); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
739 |
if (name == vmSymbols::object_initializer_name()) { |
31019 | 740 |
LinkResolver::resolve_special_call(result, link_info, THREAD); |
2534 | 741 |
} else { |
742 |
break; // will throw after end of switch |
|
743 |
} |
|
744 |
if (HAS_PENDING_EXCEPTION) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
745 |
return empty; |
2534 | 746 |
} |
747 |
} |
|
748 |
assert(result.is_statically_bound(), ""); |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
749 |
oop mname2 = init_method_MemberName(mname, result); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
750 |
return Handle(THREAD, mname2); |
2534 | 751 |
} |
752 |
case IS_FIELD: |
|
753 |
{ |
|
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
754 |
fieldDescriptor result; // find_field initializes fd if found |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
755 |
{ |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
756 |
assert(!HAS_PENDING_EXCEPTION, ""); |
34238 | 757 |
LinkInfo link_info(defc, name, type, caller, /*check_access*/false); |
31019 | 758 |
LinkResolver::resolve_field(result, link_info, Bytecodes::_nop, false, THREAD); |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
759 |
if (HAS_PENDING_EXCEPTION) { |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
760 |
return empty; |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
761 |
} |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
762 |
} |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
763 |
oop mname2 = init_field_MemberName(mname, result, ref_kind_is_setter(ref_kind)); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
764 |
return Handle(THREAD, mname2); |
2534 | 765 |
} |
5421
e294db54fc0d
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
5420
diff
changeset
|
766 |
default: |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
767 |
THROW_MSG_(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format", empty); |
2534 | 768 |
} |
5421
e294db54fc0d
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
5420
diff
changeset
|
769 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
770 |
return empty; |
2534 | 771 |
} |
772 |
||
773 |
// Conversely, a member name which is only initialized from JVM internals |
|
774 |
// may have null defc, name, and type fields. |
|
775 |
// Resolving it plants a vmtarget/vmindex in it, |
|
776 |
// which refers directly to JVM internals. |
|
777 |
void MethodHandles::expand_MemberName(Handle mname, int suppress, TRAPS) { |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
778 |
assert(java_lang_invoke_MemberName::is_instance(mname()), ""); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
779 |
Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(mname()); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
780 |
int vmindex = java_lang_invoke_MemberName::vmindex(mname()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
781 |
if (vmtarget == NULL) { |
2534 | 782 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "nothing to expand"); |
783 |
} |
|
784 |
||
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
785 |
bool have_defc = (java_lang_invoke_MemberName::clazz(mname()) != NULL); |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
786 |
bool have_name = (java_lang_invoke_MemberName::name(mname()) != NULL); |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
787 |
bool have_type = (java_lang_invoke_MemberName::type(mname()) != NULL); |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
788 |
int flags = java_lang_invoke_MemberName::flags(mname()); |
2534 | 789 |
|
790 |
if (suppress != 0) { |
|
791 |
if (suppress & _suppress_defc) have_defc = true; |
|
792 |
if (suppress & _suppress_name) have_name = true; |
|
793 |
if (suppress & _suppress_type) have_type = true; |
|
794 |
} |
|
795 |
||
796 |
if (have_defc && have_name && have_type) return; // nothing needed |
|
797 |
||
798 |
switch (flags & ALL_KINDS) { |
|
799 |
case IS_METHOD: |
|
800 |
case IS_CONSTRUCTOR: |
|
801 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
802 |
assert(vmtarget->is_method(), "method or constructor vmtarget is Method*"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
803 |
methodHandle m(THREAD, (Method*)vmtarget); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
804 |
DEBUG_ONLY(vmtarget = NULL); // safety |
2534 | 805 |
if (m.is_null()) break; |
806 |
if (!have_defc) { |
|
14391
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
13973
diff
changeset
|
807 |
InstanceKlass* defc = m->method_holder(); |
df0a1573d5bd
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
13973
diff
changeset
|
808 |
java_lang_invoke_MemberName::set_clazz(mname(), defc->java_mirror()); |
2534 | 809 |
} |
810 |
if (!have_name) { |
|
811 |
//not java_lang_String::create_from_symbol; let's intern member names |
|
812 |
Handle name = StringTable::intern(m->name(), CHECK); |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
813 |
java_lang_invoke_MemberName::set_name(mname(), name()); |
2534 | 814 |
} |
815 |
if (!have_type) { |
|
816 |
Handle type = java_lang_String::create_from_symbol(m->signature(), CHECK); |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
817 |
java_lang_invoke_MemberName::set_type(mname(), type()); |
2534 | 818 |
} |
819 |
return; |
|
820 |
} |
|
821 |
case IS_FIELD: |
|
822 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
823 |
assert(vmtarget->is_klass(), "field vmtarget is Klass*"); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
824 |
if (!((Klass*) vmtarget)->is_instance_klass()) break; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
825 |
instanceKlassHandle defc(THREAD, (Klass*) vmtarget); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
826 |
DEBUG_ONLY(vmtarget = NULL); // safety |
2534 | 827 |
bool is_static = ((flags & JVM_ACC_STATIC) != 0); |
828 |
fieldDescriptor fd; // find_field initializes fd if found |
|
829 |
if (!defc->find_field_from_offset(vmindex, is_static, &fd)) |
|
830 |
break; // cannot expand |
|
831 |
if (!have_defc) { |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
832 |
java_lang_invoke_MemberName::set_clazz(mname(), defc->java_mirror()); |
2534 | 833 |
} |
834 |
if (!have_name) { |
|
835 |
//not java_lang_String::create_from_symbol; let's intern member names |
|
836 |
Handle name = StringTable::intern(fd.name(), CHECK); |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
837 |
java_lang_invoke_MemberName::set_name(mname(), name()); |
2534 | 838 |
} |
839 |
if (!have_type) { |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
840 |
// If it is a primitive field type, don't mess with short strings like "I". |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
841 |
Handle type = field_signature_type_or_null(fd.signature()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
842 |
if (type.is_null()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
843 |
java_lang_String::create_from_symbol(fd.signature(), CHECK); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
844 |
} |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
845 |
java_lang_invoke_MemberName::set_type(mname(), type()); |
2534 | 846 |
} |
847 |
return; |
|
848 |
} |
|
849 |
} |
|
850 |
THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format"); |
|
851 |
} |
|
852 |
||
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
853 |
int MethodHandles::find_MemberNames(KlassHandle k, |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
854 |
Symbol* name, Symbol* sig, |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
855 |
int mflags, KlassHandle caller, |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
856 |
int skip, objArrayHandle results) { |
2534 | 857 |
// %%% take caller into account! |
858 |
||
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
859 |
Thread* thread = Thread::current(); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
860 |
|
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
861 |
if (k.is_null() || !k->is_instance_klass()) return -1; |
2534 | 862 |
|
863 |
int rfill = 0, rlimit = results->length(), rskip = skip; |
|
864 |
// overflow measurement: |
|
865 |
int overflow = 0, overflow_limit = MAX2(1000, rlimit); |
|
866 |
||
867 |
int match_flags = mflags; |
|
868 |
bool search_superc = ((match_flags & SEARCH_SUPERCLASSES) != 0); |
|
869 |
bool search_intfc = ((match_flags & SEARCH_INTERFACES) != 0); |
|
870 |
bool local_only = !(search_superc | search_intfc); |
|
871 |
bool classes_only = false; |
|
872 |
||
873 |
if (name != NULL) { |
|
874 |
if (name->utf8_length() == 0) return 0; // a match is not possible |
|
875 |
} |
|
876 |
if (sig != NULL) { |
|
877 |
if (sig->utf8_length() == 0) return 0; // a match is not possible |
|
878 |
if (sig->byte_at(0) == '(') |
|
879 |
match_flags &= ~(IS_FIELD | IS_TYPE); |
|
880 |
else |
|
881 |
match_flags &= ~(IS_CONSTRUCTOR | IS_METHOD); |
|
882 |
} |
|
883 |
||
884 |
if ((match_flags & IS_TYPE) != 0) { |
|
885 |
// NYI, and Core Reflection works quite well for this query |
|
886 |
} |
|
887 |
||
888 |
if ((match_flags & IS_FIELD) != 0) { |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
889 |
for (FieldStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) { |
2534 | 890 |
if (name != NULL && st.name() != name) |
891 |
continue; |
|
892 |
if (sig != NULL && st.signature() != sig) |
|
893 |
continue; |
|
894 |
// passed the filters |
|
895 |
if (rskip > 0) { |
|
896 |
--rskip; |
|
897 |
} else if (rfill < rlimit) { |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
898 |
Handle result(thread, results->obj_at(rfill++)); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
899 |
if (!java_lang_invoke_MemberName::is_instance(result())) |
2534 | 900 |
return -99; // caller bug! |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
901 |
oop saved = MethodHandles::init_field_MemberName(result, st.field_descriptor()); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
902 |
if (saved != result()) |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
903 |
results->obj_at_put(rfill-1, saved); // show saved instance to user |
2534 | 904 |
} else if (++overflow >= overflow_limit) { |
905 |
match_flags = 0; break; // got tired of looking at overflow |
|
906 |
} |
|
907 |
} |
|
908 |
} |
|
909 |
||
910 |
if ((match_flags & (IS_METHOD | IS_CONSTRUCTOR)) != 0) { |
|
911 |
// watch out for these guys: |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
912 |
Symbol* init_name = vmSymbols::object_initializer_name(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
913 |
Symbol* clinit_name = vmSymbols::class_initializer_name(); |
2534 | 914 |
if (name == clinit_name) clinit_name = NULL; // hack for exposing <clinit> |
915 |
bool negate_name_test = false; |
|
916 |
// fix name so that it captures the intention of IS_CONSTRUCTOR |
|
917 |
if (!(match_flags & IS_METHOD)) { |
|
918 |
// constructors only |
|
919 |
if (name == NULL) { |
|
920 |
name = init_name; |
|
921 |
} else if (name != init_name) { |
|
922 |
return 0; // no constructors of this method name |
|
923 |
} |
|
924 |
} else if (!(match_flags & IS_CONSTRUCTOR)) { |
|
925 |
// methods only |
|
926 |
if (name == NULL) { |
|
927 |
name = init_name; |
|
928 |
negate_name_test = true; // if we see the name, we *omit* the entry |
|
929 |
} else if (name == init_name) { |
|
930 |
return 0; // no methods of this constructor name |
|
931 |
} |
|
932 |
} else { |
|
933 |
// caller will accept either sort; no need to adjust name |
|
934 |
} |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
935 |
for (MethodStream st(k(), local_only, !search_intfc); !st.eos(); st.next()) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
936 |
Method* m = st.method(); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
937 |
Symbol* m_name = m->name(); |
2534 | 938 |
if (m_name == clinit_name) |
939 |
continue; |
|
940 |
if (name != NULL && ((m_name != name) ^ negate_name_test)) |
|
941 |
continue; |
|
942 |
if (sig != NULL && m->signature() != sig) |
|
943 |
continue; |
|
944 |
// passed the filters |
|
945 |
if (rskip > 0) { |
|
946 |
--rskip; |
|
947 |
} else if (rfill < rlimit) { |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
948 |
Handle result(thread, results->obj_at(rfill++)); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
949 |
if (!java_lang_invoke_MemberName::is_instance(result())) |
2534 | 950 |
return -99; // caller bug! |
20017
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
951 |
CallInfo info(m); |
81eba62e9048
8014013: CallInfo structure no longer accurately reports the result of a LinkResolver operation
drchase
parents:
18508
diff
changeset
|
952 |
oop saved = MethodHandles::init_method_MemberName(result, info); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
953 |
if (saved != result()) |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
954 |
results->obj_at_put(rfill-1, saved); // show saved instance to user |
2534 | 955 |
} else if (++overflow >= overflow_limit) { |
956 |
match_flags = 0; break; // got tired of looking at overflow |
|
957 |
} |
|
958 |
} |
|
959 |
} |
|
960 |
||
961 |
// return number of elements we at leasted wanted to initialize |
|
962 |
return rfill + overflow; |
|
963 |
} |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
964 |
|
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
965 |
// Is it safe to remove stale entries from a dependency list? |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
966 |
static bool safe_to_expunge() { |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
967 |
// Since parallel GC threads can concurrently iterate over a dependency |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
968 |
// list during safepoint, it is safe to remove entries only when |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
969 |
// CodeCache lock is held. |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
970 |
return CodeCache_lock->owned_by_self(); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
971 |
} |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
972 |
|
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
973 |
void MethodHandles::add_dependent_nmethod(oop call_site, nmethod* nm) { |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
974 |
assert_locked_or_safepoint(CodeCache_lock); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
975 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
976 |
oop context = java_lang_invoke_CallSite::context(call_site); |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
977 |
DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
978 |
// Try to purge stale entries on updates. |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
979 |
// Since GC doesn't clean dependency contexts rooted at CallSiteContext objects, |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
980 |
// in order to avoid memory leak, stale entries are purged whenever a dependency list |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
981 |
// is changed (both on addition and removal). Though memory reclamation is delayed, |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
982 |
// it avoids indefinite memory usage growth. |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
983 |
deps.add_dependent_nmethod(nm, /*expunge_stale_entries=*/safe_to_expunge()); |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
984 |
} |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
985 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
986 |
void MethodHandles::remove_dependent_nmethod(oop call_site, nmethod* nm) { |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
987 |
assert_locked_or_safepoint(CodeCache_lock); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
988 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
989 |
oop context = java_lang_invoke_CallSite::context(call_site); |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
990 |
DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
991 |
deps.remove_dependent_nmethod(nm, /*expunge_stale_entries=*/safe_to_expunge()); |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
992 |
} |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
993 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
994 |
void MethodHandles::flush_dependent_nmethods(Handle call_site, Handle target) { |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
995 |
assert_lock_strong(Compile_lock); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
996 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
997 |
int marked = 0; |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
998 |
CallSiteDepChange changes(call_site(), target()); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
999 |
{ |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34317
diff
changeset
|
1000 |
NoSafepointVerifier nsv; |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1001 |
MutexLockerEx mu2(CodeCache_lock, Mutex::_no_safepoint_check_flag); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1002 |
|
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1003 |
oop context = java_lang_invoke_CallSite::context(call_site()); |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1004 |
DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1005 |
marked = deps.mark_dependent_nmethods(changes); |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1006 |
} |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1007 |
if (marked > 0) { |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1008 |
// At least one nmethod has been marked for deoptimization. |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1009 |
VM_Deoptimize op; |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1010 |
VMThread::execute(&op); |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1011 |
} |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1012 |
} |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1013 |
|
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1014 |
//------------------------------------------------------------------------------ |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1015 |
// MemberNameTable |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1016 |
// |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1017 |
|
17828
17131ab4b3b5
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
17388
diff
changeset
|
1018 |
MemberNameTable::MemberNameTable(int methods_cnt) |
17131ab4b3b5
8014288: perf regression in nashorn JDK-8008448.js test after 8008511 changes
sspitsyn
parents:
17388
diff
changeset
|
1019 |
: GrowableArray<jweak>(methods_cnt, true) { |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1020 |
assert_locked_or_safepoint(MemberNameTable_lock); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1021 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1022 |
|
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1023 |
MemberNameTable::~MemberNameTable() { |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1024 |
assert_locked_or_safepoint(MemberNameTable_lock); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1025 |
int len = this->length(); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1026 |
|
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1027 |
for (int idx = 0; idx < len; idx++) { |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1028 |
jweak ref = this->at(idx); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1029 |
JNIHandles::destroy_weak_global(ref); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1030 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1031 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1032 |
|
27674
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
1033 |
void MemberNameTable::add_member_name(jweak mem_name_wref) { |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1034 |
assert_locked_or_safepoint(MemberNameTable_lock); |
27674
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
1035 |
this->push(mem_name_wref); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1036 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1037 |
|
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1038 |
#if INCLUDE_JVMTI |
27674
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
1039 |
// It is called at safepoint only for RedefineClasses |
30289
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1040 |
void MemberNameTable::adjust_method_entries(InstanceKlass* holder, bool * trace_name_printed) { |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1041 |
assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint"); |
27674
00cabfc45357
8042235: redefining method used by multiple MethodHandles crashes VM
coleenp
parents:
27420
diff
changeset
|
1042 |
// For each redefined method |
30289
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1043 |
for (int idx = 0; idx < length(); idx++) { |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1044 |
oop mem_name = JNIHandles::resolve(this->at(idx)); |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1045 |
if (mem_name == NULL) { |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1046 |
continue; |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1047 |
} |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1048 |
Method* old_method = (Method*)java_lang_invoke_MemberName::vmtarget(mem_name); |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1049 |
|
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1050 |
if (old_method == NULL || !old_method->is_old()) { |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1051 |
continue; // skip uninteresting entries |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1052 |
} |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1053 |
if (old_method->is_deleted()) { |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1054 |
// skip entries with deleted methods |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1055 |
continue; |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1056 |
} |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1057 |
Method* new_method = holder->method_with_idnum(old_method->orig_method_idnum()); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1058 |
|
30289
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1059 |
assert(new_method != NULL, "method_with_idnum() should not be NULL"); |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1060 |
assert(old_method != new_method, "sanity check"); |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1061 |
|
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1062 |
java_lang_invoke_MemberName::set_vmtarget(mem_name, new_method); |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1063 |
|
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1064 |
if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) { |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1065 |
if (!(*trace_name_printed)) { |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1066 |
// RC_TRACE_MESG macro has an embedded ResourceMark |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1067 |
RC_TRACE_MESG(("adjust: name=%s", |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1068 |
old_method->method_holder()->external_name())); |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1069 |
*trace_name_printed = true; |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1070 |
} |
30289
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1071 |
// RC_TRACE macro has an embedded ResourceMark |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1072 |
RC_TRACE(0x00400000, ("MemberName method update: %s(%s)", |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1073 |
new_method->name()->as_C_string(), |
10b7b61d759a
8073705: more performance issues in class redefinition
sspitsyn
parents:
30224
diff
changeset
|
1074 |
new_method->signature()->as_C_string())); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1075 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1076 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1077 |
} |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1078 |
#endif // INCLUDE_JVMTI |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1079 |
|
2534 | 1080 |
// |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1081 |
// Here are the native methods in java.lang.invoke.MethodHandleNatives |
2534 | 1082 |
// They are the private interface between this JVM and the HotSpot-specific |
1083 |
// Java code that implements JSR 292 method handles. |
|
1084 |
// |
|
1085 |
// Note: We use a JVM_ENTRY macro to define each of these, for this is the way |
|
1086 |
// that intrinsic (non-JNI) native methods are defined in HotSpot. |
|
1087 |
// |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1088 |
|
2534 | 1089 |
#ifndef PRODUCT |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1090 |
#define EACH_NAMED_CON(template, requirement) \ |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1091 |
template(java_lang_invoke_MemberName,MN_IS_METHOD) \ |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1092 |
template(java_lang_invoke_MemberName,MN_IS_CONSTRUCTOR) \ |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1093 |
template(java_lang_invoke_MemberName,MN_IS_FIELD) \ |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1094 |
template(java_lang_invoke_MemberName,MN_IS_TYPE) \ |
16617
6235d2c7549f
7198429: need checked categorization of caller-sensitive methods in the JDK
twisti
parents:
14825
diff
changeset
|
1095 |
template(java_lang_invoke_MemberName,MN_CALLER_SENSITIVE) \ |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1096 |
template(java_lang_invoke_MemberName,MN_SEARCH_SUPERCLASSES) \ |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1097 |
template(java_lang_invoke_MemberName,MN_SEARCH_INTERFACES) \ |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1098 |
template(java_lang_invoke_MemberName,MN_REFERENCE_KIND_SHIFT) \ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1099 |
template(java_lang_invoke_MemberName,MN_REFERENCE_KIND_MASK) \ |
2534 | 1100 |
/*end*/ |
1101 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1102 |
#define IGNORE_REQ(req_expr) /* req_expr */ |
2534 | 1103 |
#define ONE_PLUS(scope,value) 1+ |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1104 |
static const int con_value_count = EACH_NAMED_CON(ONE_PLUS, IGNORE_REQ) 0; |
2534 | 1105 |
#define VALUE_COMMA(scope,value) scope::value, |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1106 |
static const int con_values[con_value_count+1] = { EACH_NAMED_CON(VALUE_COMMA, IGNORE_REQ) 0 }; |
2534 | 1107 |
#define STRING_NULL(scope,value) #value "\0" |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1108 |
static const char con_names[] = { EACH_NAMED_CON(STRING_NULL, IGNORE_REQ) }; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1109 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1110 |
static bool advertise_con_value(int which) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1111 |
if (which < 0) return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1112 |
bool ok = true; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1113 |
int count = 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1114 |
#define INC_COUNT(scope,value) \ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1115 |
++count; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1116 |
#define CHECK_REQ(req_expr) \ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1117 |
if (which < count) return ok; \ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1118 |
ok = (req_expr); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1119 |
EACH_NAMED_CON(INC_COUNT, CHECK_REQ); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1120 |
#undef INC_COUNT |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1121 |
#undef CHECK_REQ |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1122 |
assert(count == con_value_count, ""); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1123 |
if (which < count) return ok; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1124 |
return false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1125 |
} |
2534 | 1126 |
|
1127 |
#undef ONE_PLUS |
|
1128 |
#undef VALUE_COMMA |
|
1129 |
#undef STRING_NULL |
|
1130 |
#undef EACH_NAMED_CON |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1131 |
#endif // PRODUCT |
2534 | 1132 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1133 |
JVM_ENTRY(jint, MHN_getNamedCon(JNIEnv *env, jobject igcls, jint which, jobjectArray box_jh)) { |
2534 | 1134 |
#ifndef PRODUCT |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1135 |
if (advertise_con_value(which)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1136 |
assert(which >= 0 && which < con_value_count, ""); |
2534 | 1137 |
int con = con_values[which]; |
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1138 |
objArrayHandle box(THREAD, (objArrayOop) JNIHandles::resolve(box_jh)); |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1139 |
if (box.not_null() && box->klass() == Universe::objectArrayKlassObj() && box->length() > 0) { |
2534 | 1140 |
const char* str = &con_names[0]; |
1141 |
for (int i = 0; i < which; i++) |
|
1142 |
str += strlen(str) + 1; // skip name and null |
|
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1143 |
oop name = java_lang_String::create_oop_from_str(str, CHECK_0); // possible safepoint |
2534 | 1144 |
box->obj_at_put(0, name); |
1145 |
} |
|
1146 |
return con; |
|
1147 |
} |
|
1148 |
#endif |
|
1149 |
return 0; |
|
1150 |
} |
|
1151 |
JVM_END |
|
1152 |
||
1153 |
// void init(MemberName self, AccessibleObject ref) |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1154 |
JVM_ENTRY(void, MHN_init_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jobject target_jh)) { |
9963
4a783069663c
7047961: JSR 292 MethodHandleWalk swap args doesn't handle T_LONG and T_DOUBLE properly
never
parents:
9947
diff
changeset
|
1155 |
if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); } |
4a783069663c
7047961: JSR 292 MethodHandleWalk swap args doesn't handle T_LONG and T_DOUBLE properly
never
parents:
9947
diff
changeset
|
1156 |
if (target_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "target is null"); } |
2534 | 1157 |
Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); |
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1158 |
Handle target(THREAD, JNIHandles::resolve_non_null(target_jh)); |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1159 |
MethodHandles::init_MemberName(mname, target); |
2534 | 1160 |
} |
1161 |
JVM_END |
|
1162 |
||
1163 |
// void expand(MemberName self) |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1164 |
JVM_ENTRY(void, MHN_expand_Mem(JNIEnv *env, jobject igcls, jobject mname_jh)) { |
9963
4a783069663c
7047961: JSR 292 MethodHandleWalk swap args doesn't handle T_LONG and T_DOUBLE properly
never
parents:
9947
diff
changeset
|
1165 |
if (mname_jh == NULL) { THROW_MSG(vmSymbols::java_lang_InternalError(), "mname is null"); } |
2534 | 1166 |
Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); |
1167 |
MethodHandles::expand_MemberName(mname, 0, CHECK); |
|
1168 |
} |
|
1169 |
JVM_END |
|
1170 |
||
1171 |
// void resolve(MemberName self, Class<?> caller) |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1172 |
JVM_ENTRY(jobject, MHN_resolve_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jclass caller_jh)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1173 |
if (mname_jh == NULL) { THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "mname is null"); } |
2534 | 1174 |
Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1175 |
|
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1176 |
// The trusted Java code that calls this method should already have performed |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1177 |
// access checks on behalf of the given caller. But, we can verify this. |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1178 |
if (VerifyMethodHandles && caller_jh != NULL && |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1179 |
java_lang_invoke_MemberName::clazz(mname()) != NULL) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1180 |
Klass* reference_klass = java_lang_Class::as_Klass(java_lang_invoke_MemberName::clazz(mname())); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
1181 |
if (reference_klass != NULL && reference_klass->is_objArray_klass()) { |
18508
3b95160639d8
8017571: JSR292: JVM crashing on assert "cast to instanceKlass" while producing MethodHandle for array methods with MethodHandle.findVirtual
twisti
parents:
17828
diff
changeset
|
1182 |
reference_klass = ObjArrayKlass::cast(reference_klass)->bottom_klass(); |
3b95160639d8
8017571: JSR292: JVM crashing on assert "cast to instanceKlass" while producing MethodHandle for array methods with MethodHandle.findVirtual
twisti
parents:
17828
diff
changeset
|
1183 |
} |
3b95160639d8
8017571: JSR292: JVM crashing on assert "cast to instanceKlass" while producing MethodHandle for array methods with MethodHandle.findVirtual
twisti
parents:
17828
diff
changeset
|
1184 |
|
3b95160639d8
8017571: JSR292: JVM crashing on assert "cast to instanceKlass" while producing MethodHandle for array methods with MethodHandle.findVirtual
twisti
parents:
17828
diff
changeset
|
1185 |
// Reflection::verify_class_access can only handle instance classes. |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33198
diff
changeset
|
1186 |
if (reference_klass != NULL && reference_klass->is_instance_klass()) { |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1187 |
// Emulate LinkResolver::check_klass_accessability. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1188 |
Klass* caller = java_lang_Class::as_Klass(JNIHandles::resolve_non_null(caller_jh)); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1189 |
if (!Reflection::verify_class_access(caller, |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1190 |
reference_klass, |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1191 |
true)) { |
14488 | 1192 |
THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), reference_klass->external_name()); |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1193 |
} |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1194 |
} |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1195 |
} |
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
5050
diff
changeset
|
1196 |
|
22250 | 1197 |
KlassHandle caller(THREAD, |
1198 |
caller_jh == NULL ? (Klass*) NULL : |
|
1199 |
java_lang_Class::as_Klass(JNIHandles::resolve_non_null(caller_jh))); |
|
1200 |
Handle resolved = MethodHandles::resolve_MemberName(mname, caller, CHECK_NULL); |
|
1201 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1202 |
if (resolved.is_null()) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1203 |
int flags = java_lang_invoke_MemberName::flags(mname()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1204 |
int ref_kind = (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1205 |
if (!MethodHandles::ref_kind_is_valid(ref_kind)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1206 |
THROW_MSG_NULL(vmSymbols::java_lang_InternalError(), "obsolete MemberName format"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1207 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1208 |
if ((flags & ALL_KINDS) == IS_FIELD) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1209 |
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchMethodError(), "field resolution failed"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1210 |
} else if ((flags & ALL_KINDS) == IS_METHOD || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1211 |
(flags & ALL_KINDS) == IS_CONSTRUCTOR) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1212 |
THROW_MSG_NULL(vmSymbols::java_lang_NoSuchFieldError(), "method resolution failed"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1213 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1214 |
THROW_MSG_NULL(vmSymbols::java_lang_LinkageError(), "resolution failed"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1215 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1216 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1217 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1218 |
return JNIHandles::make_local(THREAD, resolved()); |
2534 | 1219 |
} |
1220 |
JVM_END |
|
1221 |
||
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1222 |
static jlong find_member_field_offset(oop mname, bool must_be_static, TRAPS) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1223 |
if (mname == NULL || |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1224 |
java_lang_invoke_MemberName::vmtarget(mname) == NULL) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1225 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), "mname not resolved"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1226 |
} else { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1227 |
int flags = java_lang_invoke_MemberName::flags(mname); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1228 |
if ((flags & IS_FIELD) != 0 && |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1229 |
(must_be_static |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1230 |
? (flags & JVM_ACC_STATIC) != 0 |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1231 |
: (flags & JVM_ACC_STATIC) == 0)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1232 |
int vmindex = java_lang_invoke_MemberName::vmindex(mname); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1233 |
return (jlong) vmindex; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1234 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1235 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1236 |
const char* msg = (must_be_static ? "static field required" : "non-static field required"); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1237 |
THROW_MSG_0(vmSymbols::java_lang_InternalError(), msg); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1238 |
return 0; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1239 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1240 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1241 |
JVM_ENTRY(jlong, MHN_objectFieldOffset(JNIEnv *env, jobject igcls, jobject mname_jh)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1242 |
return find_member_field_offset(JNIHandles::resolve(mname_jh), false, THREAD); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1243 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1244 |
JVM_END |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1245 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1246 |
JVM_ENTRY(jlong, MHN_staticFieldOffset(JNIEnv *env, jobject igcls, jobject mname_jh)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1247 |
return find_member_field_offset(JNIHandles::resolve(mname_jh), true, THREAD); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1248 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1249 |
JVM_END |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1250 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1251 |
JVM_ENTRY(jobject, MHN_staticFieldBase(JNIEnv *env, jobject igcls, jobject mname_jh)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1252 |
// use the other function to perform sanity checks: |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1253 |
jlong ignore = find_member_field_offset(JNIHandles::resolve(mname_jh), true, CHECK_NULL); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1254 |
oop clazz = java_lang_invoke_MemberName::clazz(JNIHandles::resolve_non_null(mname_jh)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1255 |
return JNIHandles::make_local(THREAD, clazz); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1256 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1257 |
JVM_END |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1258 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1259 |
JVM_ENTRY(jobject, MHN_getMemberVMInfo(JNIEnv *env, jobject igcls, jobject mname_jh)) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1260 |
if (mname_jh == NULL) return NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1261 |
Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1262 |
intptr_t vmindex = java_lang_invoke_MemberName::vmindex(mname()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1263 |
Metadata* vmtarget = java_lang_invoke_MemberName::vmtarget(mname()); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1264 |
objArrayHandle result = oopFactory::new_objArray(SystemDictionary::Object_klass(), 2, CHECK_NULL); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1265 |
jvalue vmindex_value; vmindex_value.j = (long)vmindex; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1266 |
oop x = java_lang_boxing_object::create(T_LONG, &vmindex_value, CHECK_NULL); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1267 |
result->obj_at_put(0, x); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1268 |
x = NULL; |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1269 |
if (vmtarget == NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1270 |
x = NULL; |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1271 |
} else if (vmtarget->is_klass()) { |
14488 | 1272 |
x = ((Klass*) vmtarget)->java_mirror(); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1273 |
} else if (vmtarget->is_method()) { |
21107
aa84c4d14e6c
8023004: JSR 292: java.lang.RuntimeException: Original target method was called.
sspitsyn
parents:
20391
diff
changeset
|
1274 |
x = mname(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1275 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1276 |
result->obj_at_put(1, x); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1277 |
return JNIHandles::make_local(env, result()); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1278 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1279 |
JVM_END |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1280 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1281 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1282 |
|
2534 | 1283 |
// static native int getMembers(Class<?> defc, String matchName, String matchSig, |
1284 |
// int matchFlags, Class<?> caller, int skip, MemberName[] results); |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1285 |
JVM_ENTRY(jint, MHN_getMembers(JNIEnv *env, jobject igcls, |
2534 | 1286 |
jclass clazz_jh, jstring name_jh, jstring sig_jh, |
1287 |
int mflags, jclass caller_jh, jint skip, jobjectArray results_jh)) { |
|
1288 |
if (clazz_jh == NULL || results_jh == NULL) return -1; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1289 |
KlassHandle k(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz_jh))); |
2534 | 1290 |
|
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1291 |
objArrayHandle results(THREAD, (objArrayOop) JNIHandles::resolve(results_jh)); |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1292 |
if (results.is_null() || !results->is_objArray()) return -1; |
2534 | 1293 |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
1294 |
TempNewSymbol name = NULL; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7887
diff
changeset
|
1295 |
TempNewSymbol sig = NULL; |
2534 | 1296 |
if (name_jh != NULL) { |
1297 |
name = java_lang_String::as_symbol_or_null(JNIHandles::resolve_non_null(name_jh)); |
|
1298 |
if (name == NULL) return 0; // a match is not possible |
|
1299 |
} |
|
1300 |
if (sig_jh != NULL) { |
|
1301 |
sig = java_lang_String::as_symbol_or_null(JNIHandles::resolve_non_null(sig_jh)); |
|
1302 |
if (sig == NULL) return 0; // a match is not possible |
|
1303 |
} |
|
1304 |
||
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1305 |
KlassHandle caller; |
2534 | 1306 |
if (caller_jh != NULL) { |
1307 |
oop caller_oop = JNIHandles::resolve_non_null(caller_jh); |
|
1308 |
if (!java_lang_Class::is_instance(caller_oop)) return -1; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13396
diff
changeset
|
1309 |
caller = KlassHandle(THREAD, java_lang_Class::as_Klass(caller_oop)); |
2534 | 1310 |
} |
1311 |
||
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9134
diff
changeset
|
1312 |
if (name != NULL && sig != NULL && results.not_null()) { |
2534 | 1313 |
// try a direct resolve |
1314 |
// %%% TO DO |
|
1315 |
} |
|
1316 |
||
17029
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1317 |
int res = MethodHandles::find_MemberNames(k, name, sig, mflags, |
9ff8d7c0ed79
8008511: JSR 292: MemberName vmtarget refs to methods must be updated at class redefinition
sspitsyn
parents:
17024
diff
changeset
|
1318 |
caller, skip, results); |
2534 | 1319 |
// TO DO: expand at least some of the MemberNames, to avoid massive callbacks |
1320 |
return res; |
|
1321 |
} |
|
1322 |
JVM_END |
|
1323 |
||
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1324 |
JVM_ENTRY(void, MHN_setCallSiteTargetNormal(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) { |
10967
e13ea25b2f0b
7094138: JSR 292: JRuby junit test fails in CallSite.setTargetNormal: obj->is_oop() failed: sanity check
twisti
parents:
10546
diff
changeset
|
1325 |
Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh)); |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1326 |
Handle target (THREAD, JNIHandles::resolve_non_null(target_jh)); |
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1327 |
{ |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1328 |
// Walk all nmethods depending on this call site. |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1329 |
MutexLocker mu(Compile_lock, thread); |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1330 |
MethodHandles::flush_dependent_nmethods(call_site, target); |
14825
8bc43f610c87
8003238: JSR 292: intermittent exception failure with java/lang/invoke/CallSiteTest.java
twisti
parents:
14488
diff
changeset
|
1331 |
java_lang_invoke_CallSite::set_target(call_site(), target()); |
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1332 |
} |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1333 |
} |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1334 |
JVM_END |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1335 |
|
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1336 |
JVM_ENTRY(void, MHN_setCallSiteTargetVolatile(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) { |
10967
e13ea25b2f0b
7094138: JSR 292: JRuby junit test fails in CallSite.setTargetNormal: obj->is_oop() failed: sanity check
twisti
parents:
10546
diff
changeset
|
1337 |
Handle call_site(THREAD, JNIHandles::resolve_non_null(call_site_jh)); |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1338 |
Handle target (THREAD, JNIHandles::resolve_non_null(target_jh)); |
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1339 |
{ |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1340 |
// Walk all nmethods depending on this call site. |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1341 |
MutexLocker mu(Compile_lock, thread); |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1342 |
MethodHandles::flush_dependent_nmethods(call_site, target); |
14825
8bc43f610c87
8003238: JSR 292: intermittent exception failure with java/lang/invoke/CallSiteTest.java
twisti
parents:
14488
diff
changeset
|
1343 |
java_lang_invoke_CallSite::set_target_volatile(call_site(), target()); |
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1344 |
} |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1345 |
} |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1346 |
JVM_END |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1347 |
|
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1348 |
// It is called by a Cleaner object which ensures that dropped CallSites properly |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1349 |
// deallocate their dependency information. |
31037
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1350 |
JVM_ENTRY(void, MHN_clearCallSiteContext(JNIEnv* env, jobject igcls, jobject context_jh)) { |
01a5c5fa5681
8079205: CallSite dependency tracking is broken after sun.misc.Cleaner became automatically cleared
vlivanov
parents:
30615
diff
changeset
|
1351 |
Handle context(THREAD, JNIHandles::resolve_non_null(context_jh)); |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1352 |
{ |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1353 |
// Walk all nmethods depending on this call site. |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1354 |
MutexLocker mu1(Compile_lock, thread); |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1355 |
|
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1356 |
int marked = 0; |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1357 |
{ |
35492
c8c0273e6b91
8146690: Make all classes in GC follow the naming convention.
david
parents:
34317
diff
changeset
|
1358 |
NoSafepointVerifier nsv; |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1359 |
MutexLockerEx mu2(CodeCache_lock, Mutex::_no_safepoint_check_flag); |
34195
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1360 |
assert(safe_to_expunge(), "removal is not safe"); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1361 |
DependencyContext deps = java_lang_invoke_MethodHandleNatives_CallSiteContext::vmdependencies(context()); |
89011d12ebd3
8139595: MethodHandles::remove_dependent_nmethod is not MT safe
vlivanov
parents:
33611
diff
changeset
|
1362 |
marked = deps.remove_all_dependents(); |
30296
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1363 |
} |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1364 |
if (marked > 0) { |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1365 |
// At least one nmethod has been marked for deoptimization |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1366 |
VM_Deoptimize op; |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1367 |
VMThread::execute(&op); |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1368 |
} |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1369 |
} |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1370 |
} |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1371 |
JVM_END |
95baefac8485
8057967: CallSite dependency tracking scales devastatingly poorly
vlivanov
parents:
30224
diff
changeset
|
1372 |
|
17381
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1373 |
/** |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1374 |
* Throws a java/lang/UnsupportedOperationException unconditionally. |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1375 |
* This is required by the specification of MethodHandle.invoke if |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1376 |
* invoked directly. |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1377 |
*/ |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1378 |
JVM_ENTRY(jobject, MH_invoke_UOE(JNIEnv* env, jobject mh, jobjectArray args)) { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1379 |
THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "MethodHandle.invoke cannot be invoked reflectively"); |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1380 |
return NULL; |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1381 |
} |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1382 |
JVM_END |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1383 |
|
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1384 |
/** |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1385 |
* Throws a java/lang/UnsupportedOperationException unconditionally. |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1386 |
* This is required by the specification of MethodHandle.invokeExact if |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1387 |
* invoked directly. |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1388 |
*/ |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1389 |
JVM_ENTRY(jobject, MH_invokeExact_UOE(JNIEnv* env, jobject mh, jobjectArray args)) { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1390 |
THROW_MSG_NULL(vmSymbols::java_lang_UnsupportedOperationException(), "MethodHandle.invokeExact cannot be invoked reflectively"); |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1391 |
return NULL; |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1392 |
} |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1393 |
JVM_END |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1394 |
|
2534 | 1395 |
/// JVM_RegisterMethodHandleMethods |
1396 |
||
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1397 |
#undef CS // Solaris builds complain |
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1398 |
|
2534 | 1399 |
#define LANG "Ljava/lang/" |
9116 | 1400 |
#define JLINV "Ljava/lang/invoke/" |
2534 | 1401 |
|
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1402 |
#define OBJ LANG "Object;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1403 |
#define CLS LANG "Class;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1404 |
#define STRG LANG "String;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1405 |
#define CS JLINV "CallSite;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1406 |
#define MT JLINV "MethodType;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1407 |
#define MH JLINV "MethodHandle;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1408 |
#define MEM JLINV "MemberName;" |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1409 |
#define CTX JLINV "MethodHandleNatives$CallSiteContext;" |
2534 | 1410 |
|
1411 |
#define CC (char*) /*cast a literal from (const char*)*/ |
|
1412 |
#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) |
|
1413 |
||
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1414 |
// These are the native methods on java.lang.invoke.MethodHandleNatives. |
17381
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1415 |
static JNINativeMethod MHN_methods[] = { |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1416 |
{CC "init", CC "(" MEM "" OBJ ")V", FN_PTR(MHN_init_Mem)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1417 |
{CC "expand", CC "(" MEM ")V", FN_PTR(MHN_expand_Mem)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1418 |
{CC "resolve", CC "(" MEM "" CLS ")" MEM, FN_PTR(MHN_resolve_Mem)}, |
2534 | 1419 |
// static native int getNamedCon(int which, Object[] name) |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1420 |
{CC "getNamedCon", CC "(I[" OBJ ")I", FN_PTR(MHN_getNamedCon)}, |
2534 | 1421 |
// static native int getMembers(Class<?> defc, String matchName, String matchSig, |
1422 |
// int matchFlags, Class<?> caller, int skip, MemberName[] results); |
|
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1423 |
{CC "getMembers", CC "(" CLS "" STRG "" STRG "I" CLS "I[" MEM ")I", FN_PTR(MHN_getMembers)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1424 |
{CC "objectFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_objectFieldOffset)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1425 |
{CC "setCallSiteTargetNormal", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetNormal)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1426 |
{CC "setCallSiteTargetVolatile", CC "(" CS "" MH ")V", FN_PTR(MHN_setCallSiteTargetVolatile)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1427 |
{CC "clearCallSiteContext", CC "(" CTX ")V", FN_PTR(MHN_clearCallSiteContext)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1428 |
{CC "staticFieldOffset", CC "(" MEM ")J", FN_PTR(MHN_staticFieldOffset)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1429 |
{CC "staticFieldBase", CC "(" MEM ")" OBJ, FN_PTR(MHN_staticFieldBase)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1430 |
{CC "getMemberVMInfo", CC "(" MEM ")" OBJ, FN_PTR(MHN_getMemberVMInfo)} |
2534 | 1431 |
}; |
1432 |
||
17381
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1433 |
static JNINativeMethod MH_methods[] = { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1434 |
// UnsupportedOperationException throwers |
31592
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1435 |
{CC "invoke", CC "([" OBJ ")" OBJ, FN_PTR(MH_invoke_UOE)}, |
43f48e165466
8081202: Hotspot compile warning: "Invalid suffix on literal; C++11 requires a space between literal and identifier"
bpittore
parents:
31050
diff
changeset
|
1436 |
{CC "invokeExact", CC "([" OBJ ")" OBJ, FN_PTR(MH_invokeExact_UOE)} |
17381
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1437 |
}; |
2534 | 1438 |
|
17381
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1439 |
/** |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1440 |
* Helper method to register native methods. |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1441 |
*/ |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1442 |
static bool register_natives(JNIEnv* env, jclass clazz, const JNINativeMethod* methods, jint nMethods) { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1443 |
int status = env->RegisterNatives(clazz, methods, nMethods); |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1444 |
if (status != JNI_OK || env->ExceptionOccurred()) { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1445 |
warning("JSR 292 method handle code is mismatched to this JVM. Disabling support."); |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1446 |
env->ExceptionClear(); |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1447 |
return false; |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1448 |
} |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1449 |
return true; |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1450 |
} |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1451 |
|
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1452 |
/** |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1453 |
* This one function is exported, used by NativeLookup. |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1454 |
*/ |
2534 | 1455 |
JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class)) { |
10540
92d59dba2407
7085860: JSR 292: implement CallSite.setTargetNormal and setTargetVolatile as native methods
twisti
parents:
10514
diff
changeset
|
1456 |
assert(!MethodHandles::enabled(), "must not be enabled"); |
4094
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1457 |
bool enable_MH = true; |
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1458 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1459 |
jclass MH_class = NULL; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1460 |
if (SystemDictionary::MethodHandle_klass() == NULL) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1461 |
enable_MH = false; |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1462 |
} else { |
14488 | 1463 |
oop mirror = SystemDictionary::MethodHandle_klass()->java_mirror(); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1464 |
MH_class = (jclass) JNIHandles::make_local(env, mirror); |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1465 |
} |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1466 |
|
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1467 |
if (enable_MH) { |
2534 | 1468 |
ThreadToNativeFromVM ttnfv(thread); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1469 |
|
17381
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1470 |
if (enable_MH) { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1471 |
enable_MH = register_natives(env, MHN_class, MHN_methods, sizeof(MHN_methods)/sizeof(JNINativeMethod)); |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1472 |
} |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1473 |
if (enable_MH) { |
a53ac5bf4850
7196277: JSR 292: Two jck/runtime tests crash on java.lang.invoke.MethodHandle.invokeExact
twisti
parents:
17087
diff
changeset
|
1474 |
enable_MH = register_natives(env, MH_class, MH_methods, sizeof(MH_methods)/sizeof(JNINativeMethod)); |
2534 | 1475 |
} |
1476 |
} |
|
2570
ecc7862946d4
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
2534
diff
changeset
|
1477 |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1478 |
if (TraceInvokeDynamic) { |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13293
diff
changeset
|
1479 |
tty->print_cr("MethodHandle support loaded (using LambdaForms)"); |
4094
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1480 |
} |
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1481 |
|
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1482 |
if (enable_MH) { |
27420
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
1483 |
if (MethodHandles::generate_adapters() == false) { |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
1484 |
THROW_MSG(vmSymbols::java_lang_VirtualMachineError(), "Out of space in CodeCache for method handle adapters"); |
04e6f914cce1
8046809: vm/mlvm/meth/stress/compiler/deoptimize CodeCache is full.
anoll
parents:
24429
diff
changeset
|
1485 |
} |
4094
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1486 |
MethodHandles::set_enabled(true); |
1f424b2b2171
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
2570
diff
changeset
|
1487 |
} |
2534 | 1488 |
} |
1489 |
JVM_END |