Mercurial > hg > truffle
annotate src/share/vm/prims/methodHandles.cpp @ 2478:328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
Summary: Make MH verification tests more correct, robust, and informative. Fix lingering symbol refcount problems.
Reviewed-by: twisti
| author | jrose |
|---|---|
| date | Sat, 09 Apr 2011 22:55:25 -0700 |
| parents | ed69575596ac |
| children | 2a23b1b5a0a8 |
| rev | line source |
|---|---|
| 710 | 1 /* |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
2 * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. |
| 710 | 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 * | |
|
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
|
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1508
diff
changeset
|
21 * questions. |
| 710 | 22 * |
| 23 */ | |
| 24 | |
| 1972 | 25 #include "precompiled.hpp" |
| 26 #include "classfile/symbolTable.hpp" | |
| 27 #include "interpreter/interpreter.hpp" | |
| 28 #include "memory/allocation.inline.hpp" | |
| 29 #include "memory/oopFactory.hpp" | |
| 30 #include "prims/methodHandles.hpp" | |
| 31 #include "runtime/javaCalls.hpp" | |
| 32 #include "runtime/reflection.hpp" | |
| 33 #include "runtime/signature.hpp" | |
| 34 #include "runtime/stubRoutines.hpp" | |
| 35 | |
| 710 | 36 /* |
| 37 * JSR 292 reference implementation: method handles | |
| 38 */ | |
| 39 | |
| 40 bool MethodHandles::_enabled = false; // set true after successful native linkage | |
| 41 | |
| 42 MethodHandleEntry* MethodHandles::_entries[MethodHandles::_EK_LIMIT] = {NULL}; | |
| 43 const char* MethodHandles::_entry_names[_EK_LIMIT+1] = { | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
44 "raise_exception", |
| 710 | 45 "invokestatic", // how a MH emulates invokestatic |
| 46 "invokespecial", // ditto for the other invokes... | |
| 47 "invokevirtual", | |
| 48 "invokeinterface", | |
| 49 "bound_ref", // these are for BMH... | |
| 50 "bound_int", | |
| 51 "bound_long", | |
| 52 "bound_ref_direct", // (direct versions have a direct methodOop) | |
| 53 "bound_int_direct", | |
| 54 "bound_long_direct", | |
| 55 | |
| 56 // starting at _adapter_mh_first: | |
| 57 "adapter_retype_only", // these are for AMH... | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
58 "adapter_retype_raw", |
| 710 | 59 "adapter_check_cast", |
| 60 "adapter_prim_to_prim", | |
| 61 "adapter_ref_to_prim", | |
| 62 "adapter_prim_to_ref", | |
| 63 "adapter_swap_args", | |
| 64 "adapter_rot_args", | |
| 65 "adapter_dup_args", | |
| 66 "adapter_drop_args", | |
| 67 "adapter_collect_args", | |
| 68 "adapter_spread_args", | |
| 69 "adapter_flyby", | |
| 70 "adapter_ricochet", | |
| 71 | |
| 72 // optimized adapter types: | |
| 73 "adapter_swap_args/1", | |
| 74 "adapter_swap_args/2", | |
| 75 "adapter_rot_args/1,up", | |
| 76 "adapter_rot_args/1,down", | |
| 77 "adapter_rot_args/2,up", | |
| 78 "adapter_rot_args/2,down", | |
| 79 "adapter_prim_to_prim/i2i", | |
| 80 "adapter_prim_to_prim/l2i", | |
| 81 "adapter_prim_to_prim/d2f", | |
| 82 "adapter_prim_to_prim/i2l", | |
| 83 "adapter_prim_to_prim/f2d", | |
| 84 "adapter_ref_to_prim/unboxi", | |
| 85 "adapter_ref_to_prim/unboxl", | |
| 86 "adapter_spread_args/0", | |
| 87 "adapter_spread_args/1", | |
| 88 "adapter_spread_args/more", | |
| 89 | |
| 90 NULL | |
| 91 }; | |
| 92 | |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
93 // Adapters. |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
94 MethodHandlesAdapterBlob* MethodHandles::_adapter_code = NULL; |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
95 int MethodHandles::_adapter_code_size = StubRoutines::method_handles_adapters_code_size; |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
96 |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
97 jobject MethodHandles::_raise_exception_method; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
98 |
| 710 | 99 #ifdef ASSERT |
| 100 bool MethodHandles::spot_check_entry_names() { | |
| 101 assert(!strcmp(entry_name(_invokestatic_mh), "invokestatic"), ""); | |
| 102 assert(!strcmp(entry_name(_bound_ref_mh), "bound_ref"), ""); | |
| 103 assert(!strcmp(entry_name(_adapter_retype_only), "adapter_retype_only"), ""); | |
| 104 assert(!strcmp(entry_name(_adapter_ricochet), "adapter_ricochet"), ""); | |
| 105 assert(!strcmp(entry_name(_adapter_opt_unboxi), "adapter_ref_to_prim/unboxi"), ""); | |
| 106 return true; | |
| 107 } | |
| 108 #endif | |
| 109 | |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
110 |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
111 //------------------------------------------------------------------------------ |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
112 // MethodHandles::generate_adapters |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
113 // |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
114 void MethodHandles::generate_adapters() { |
|
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
115 if (!EnableInvokeDynamic || SystemDictionary::MethodHandle_klass() == NULL) return; |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
116 |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
117 assert(_adapter_code == NULL, "generate only once"); |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
118 |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
119 ResourceMark rm; |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
120 TraceTime timer("MethodHandles adapters generation", TraceStartupTime); |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
121 _adapter_code = MethodHandlesAdapterBlob::create(_adapter_code_size); |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
122 if (_adapter_code == NULL) |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
123 vm_exit_out_of_memory(_adapter_code_size, "CodeCache: no room for MethodHandles adapters"); |
| 1748 | 124 CodeBuffer code(_adapter_code); |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
125 MethodHandlesAdapterGenerator g(&code); |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
126 g.generate(); |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
127 } |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
128 |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
129 |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
130 //------------------------------------------------------------------------------ |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
131 // MethodHandlesAdapterGenerator::generate |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
132 // |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
133 void MethodHandlesAdapterGenerator::generate() { |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
134 // Generate generic method handle adapters. |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
135 for (MethodHandles::EntryKind ek = MethodHandles::_EK_FIRST; |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
136 ek < MethodHandles::_EK_LIMIT; |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
137 ek = MethodHandles::EntryKind(1 + (int)ek)) { |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
138 StubCodeMark mark(this, "MethodHandle", MethodHandles::entry_name(ek)); |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
139 MethodHandles::generate_method_handle_stub(_masm, ek); |
|
1299
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
140 } |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
141 } |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
142 |
|
9eba43136cb5
6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob
twisti
parents:
1142
diff
changeset
|
143 |
| 710 | 144 void MethodHandles::set_enabled(bool z) { |
| 145 if (_enabled != z) { | |
|
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
146 guarantee(z && EnableInvokeDynamic, "can only enable once, and only if -XX:+EnableInvokeDynamic"); |
| 710 | 147 _enabled = z; |
| 148 } | |
| 149 } | |
| 150 | |
| 151 // Note: A method which does not have a TRAPS argument cannot block in the GC | |
| 152 // or throw exceptions. Such methods are used in this file to do something quick | |
| 153 // and local, like parse a data structure. For speed, such methods work on plain | |
| 154 // oops, not handles. Trapping methods uniformly operate on handles. | |
| 155 | |
| 156 methodOop MethodHandles::decode_vmtarget(oop vmtarget, int vmindex, oop mtype, | |
| 157 klassOop& receiver_limit_result, int& decode_flags_result) { | |
| 158 if (vmtarget == NULL) return NULL; | |
| 159 assert(methodOopDesc::nonvirtual_vtable_index < 0, "encoding"); | |
| 160 if (vmindex < 0) { | |
| 161 // this DMH performs no dispatch; it is directly bound to a methodOop | |
| 162 // A MemberName may either be directly bound to a methodOop, | |
| 163 // or it may use the klass/index form; both forms mean the same thing. | |
| 164 methodOop m = decode_methodOop(methodOop(vmtarget), decode_flags_result); | |
| 165 if ((decode_flags_result & _dmf_has_receiver) != 0 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
166 && java_lang_invoke_MethodType::is_instance(mtype)) { |
| 710 | 167 // Extract receiver type restriction from mtype.ptypes[0]. |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
168 objArrayOop ptypes = java_lang_invoke_MethodType::ptypes(mtype); |
| 710 | 169 oop ptype0 = (ptypes == NULL || ptypes->length() < 1) ? oop(NULL) : ptypes->obj_at(0); |
| 170 if (java_lang_Class::is_instance(ptype0)) | |
| 171 receiver_limit_result = java_lang_Class::as_klassOop(ptype0); | |
| 172 } | |
| 173 if (vmindex == methodOopDesc::nonvirtual_vtable_index) { | |
| 174 // this DMH can be an "invokespecial" version | |
| 175 decode_flags_result &= ~_dmf_does_dispatch; | |
| 176 } else { | |
| 177 assert(vmindex == methodOopDesc::invalid_vtable_index, "random vmindex?"); | |
| 178 } | |
| 179 return m; | |
| 180 } else { | |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
181 assert(vmtarget->is_klass(), "must be class or interface"); |
| 710 | 182 decode_flags_result |= MethodHandles::_dmf_does_dispatch; |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
183 decode_flags_result |= MethodHandles::_dmf_has_receiver; |
| 710 | 184 receiver_limit_result = (klassOop)vmtarget; |
| 185 Klass* tk = Klass::cast((klassOop)vmtarget); | |
| 186 if (tk->is_interface()) { | |
| 187 // an itable linkage is <interface, itable index> | |
| 188 decode_flags_result |= MethodHandles::_dmf_from_interface; | |
| 189 return klassItable::method_for_itable_index((klassOop)vmtarget, vmindex); | |
| 190 } else { | |
| 191 if (!tk->oop_is_instance()) | |
| 1142 | 192 tk = instanceKlass::cast(SystemDictionary::Object_klass()); |
| 710 | 193 return ((instanceKlass*)tk)->method_at_vtable(vmindex); |
| 194 } | |
| 195 } | |
| 196 } | |
| 197 | |
| 198 // MemberName and DirectMethodHandle have the same linkage to the JVM internals. | |
| 199 // (MemberName is the non-operational name used for queries and setup.) | |
| 200 | |
| 201 methodOop MethodHandles::decode_DirectMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
202 oop vmtarget = java_lang_invoke_DirectMethodHandle::vmtarget(mh); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
203 int vmindex = java_lang_invoke_DirectMethodHandle::vmindex(mh); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
204 oop mtype = java_lang_invoke_DirectMethodHandle::type(mh); |
| 710 | 205 return decode_vmtarget(vmtarget, vmindex, mtype, receiver_limit_result, decode_flags_result); |
| 206 } | |
| 207 | |
| 208 methodOop MethodHandles::decode_BoundMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
209 assert(java_lang_invoke_BoundMethodHandle::is_instance(mh), ""); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
210 assert(mh->klass() != SystemDictionary::AdapterMethodHandle_klass(), ""); |
| 710 | 211 for (oop bmh = mh;;) { |
| 212 // Bound MHs can be stacked to bind several arguments. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
213 oop target = java_lang_invoke_MethodHandle::vmtarget(bmh); |
| 710 | 214 if (target == NULL) return NULL; |
| 215 decode_flags_result |= MethodHandles::_dmf_binds_argument; | |
| 216 klassOop tk = target->klass(); | |
| 217 if (tk == SystemDictionary::BoundMethodHandle_klass()) { | |
| 218 bmh = target; | |
| 219 continue; | |
| 220 } else { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
221 if (java_lang_invoke_MethodHandle::is_subclass(tk)) { |
| 710 | 222 //assert(tk == SystemDictionary::DirectMethodHandle_klass(), "end of BMH chain must be DMH"); |
| 223 return decode_MethodHandle(target, receiver_limit_result, decode_flags_result); | |
| 224 } else { | |
| 225 // Optimized case: binding a receiver to a non-dispatched DMH | |
| 226 // short-circuits directly to the methodOop. | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
227 // (It might be another argument besides a receiver also.) |
| 710 | 228 assert(target->is_method(), "must be a simple method"); |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
229 decode_flags_result |= MethodHandles::_dmf_binds_method; |
| 710 | 230 methodOop m = (methodOop) target; |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
231 if (!m->is_static()) |
|
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
232 decode_flags_result |= MethodHandles::_dmf_has_receiver; |
| 710 | 233 return m; |
| 234 } | |
| 235 } | |
| 236 } | |
| 237 } | |
| 238 | |
| 239 methodOop MethodHandles::decode_AdapterMethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result) { | |
| 240 assert(mh->klass() == SystemDictionary::AdapterMethodHandle_klass(), ""); | |
| 241 for (oop amh = mh;;) { | |
| 242 // Adapter MHs can be stacked to convert several arguments. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
243 int conv_op = adapter_conversion_op(java_lang_invoke_AdapterMethodHandle::conversion(amh)); |
| 710 | 244 decode_flags_result |= (_dmf_adapter_lsb << conv_op) & _DMF_ADAPTER_MASK; |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
245 oop target = java_lang_invoke_MethodHandle::vmtarget(amh); |
| 710 | 246 if (target == NULL) return NULL; |
| 247 klassOop tk = target->klass(); | |
| 248 if (tk == SystemDictionary::AdapterMethodHandle_klass()) { | |
| 249 amh = target; | |
| 250 continue; | |
| 251 } else { | |
| 252 // must be a BMH (which will bind some more arguments) or a DMH (for the final call) | |
| 253 return MethodHandles::decode_MethodHandle(target, receiver_limit_result, decode_flags_result); | |
| 254 } | |
| 255 } | |
| 256 } | |
| 257 | |
| 258 methodOop MethodHandles::decode_MethodHandle(oop mh, klassOop& receiver_limit_result, int& decode_flags_result) { | |
| 259 if (mh == NULL) return NULL; | |
| 260 klassOop mhk = mh->klass(); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
261 assert(java_lang_invoke_MethodHandle::is_subclass(mhk), "must be a MethodHandle"); |
| 710 | 262 if (mhk == SystemDictionary::DirectMethodHandle_klass()) { |
| 263 return decode_DirectMethodHandle(mh, receiver_limit_result, decode_flags_result); | |
| 264 } else if (mhk == SystemDictionary::BoundMethodHandle_klass()) { | |
| 265 return decode_BoundMethodHandle(mh, receiver_limit_result, decode_flags_result); | |
| 266 } else if (mhk == SystemDictionary::AdapterMethodHandle_klass()) { | |
| 267 return decode_AdapterMethodHandle(mh, receiver_limit_result, decode_flags_result); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
268 } else if (java_lang_invoke_BoundMethodHandle::is_subclass(mhk)) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
269 // could be a JavaMethodHandle (but not an adapter MH) |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
270 return decode_BoundMethodHandle(mh, receiver_limit_result, decode_flags_result); |
| 710 | 271 } else { |
| 272 assert(false, "cannot parse this MH"); | |
| 273 return NULL; // random MH? | |
| 274 } | |
| 275 } | |
| 276 | |
| 277 methodOop MethodHandles::decode_methodOop(methodOop m, int& decode_flags_result) { | |
| 278 assert(m->is_method(), ""); | |
| 279 if (m->is_static()) { | |
| 280 // check that signature begins '(L' or '([' (not '(I', '()', etc.) | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
281 Symbol* sig = m->signature(); |
| 710 | 282 BasicType recv_bt = char2type(sig->byte_at(1)); |
| 283 // Note: recv_bt might be T_ILLEGAL if byte_at(2) is ')' | |
| 284 assert(sig->byte_at(0) == '(', "must be method sig"); | |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
285 // if (recv_bt == T_OBJECT || recv_bt == T_ARRAY) |
|
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
286 // decode_flags_result |= _dmf_has_receiver; |
| 710 | 287 } else { |
| 288 // non-static method | |
| 289 decode_flags_result |= _dmf_has_receiver; | |
| 290 if (!m->can_be_statically_bound() && !m->is_initializer()) { | |
| 291 decode_flags_result |= _dmf_does_dispatch; | |
| 292 if (Klass::cast(m->method_holder())->is_interface()) | |
| 293 decode_flags_result |= _dmf_from_interface; | |
| 294 } | |
| 295 } | |
| 296 return m; | |
| 297 } | |
| 298 | |
| 299 | |
| 300 // A trusted party is handing us a cookie to determine a method. | |
| 301 // Let's boil it down to the method oop they really want. | |
| 302 methodOop MethodHandles::decode_method(oop x, klassOop& receiver_limit_result, int& decode_flags_result) { | |
| 303 decode_flags_result = 0; | |
| 304 receiver_limit_result = NULL; | |
| 305 klassOop xk = x->klass(); | |
| 306 if (xk == Universe::methodKlassObj()) { | |
| 307 return decode_methodOop((methodOop) x, decode_flags_result); | |
| 308 } else if (xk == SystemDictionary::MemberName_klass()) { | |
| 309 // Note: This only works if the MemberName has already been resolved. | |
| 310 return decode_MemberName(x, receiver_limit_result, decode_flags_result); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
311 } else if (java_lang_invoke_MethodHandle::is_subclass(xk)) { |
| 710 | 312 return decode_MethodHandle(x, receiver_limit_result, decode_flags_result); |
| 1142 | 313 } else if (xk == SystemDictionary::reflect_Method_klass()) { |
| 710 | 314 oop clazz = java_lang_reflect_Method::clazz(x); |
| 315 int slot = java_lang_reflect_Method::slot(x); | |
| 316 klassOop k = java_lang_Class::as_klassOop(clazz); | |
| 317 if (k != NULL && Klass::cast(k)->oop_is_instance()) | |
| 318 return decode_methodOop(instanceKlass::cast(k)->method_with_idnum(slot), | |
| 319 decode_flags_result); | |
| 1142 | 320 } else if (xk == SystemDictionary::reflect_Constructor_klass()) { |
| 710 | 321 oop clazz = java_lang_reflect_Constructor::clazz(x); |
| 322 int slot = java_lang_reflect_Constructor::slot(x); | |
| 323 klassOop k = java_lang_Class::as_klassOop(clazz); | |
| 324 if (k != NULL && Klass::cast(k)->oop_is_instance()) | |
| 325 return decode_methodOop(instanceKlass::cast(k)->method_with_idnum(slot), | |
| 326 decode_flags_result); | |
| 327 } else { | |
| 328 // unrecognized object | |
| 329 assert(!x->is_method(), "already checked"); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
330 assert(!java_lang_invoke_MemberName::is_instance(x), "already checked"); |
| 710 | 331 } |
| 332 return NULL; | |
| 333 } | |
| 334 | |
| 335 | |
| 336 int MethodHandles::decode_MethodHandle_stack_pushes(oop mh) { | |
| 337 if (mh->klass() == SystemDictionary::DirectMethodHandle_klass()) | |
| 338 return 0; // no push/pop | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
339 int this_vmslots = java_lang_invoke_MethodHandle::vmslots(mh); |
| 710 | 340 int last_vmslots = 0; |
| 341 oop last_mh = mh; | |
| 342 for (;;) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
343 oop target = java_lang_invoke_MethodHandle::vmtarget(last_mh); |
| 710 | 344 if (target->klass() == SystemDictionary::DirectMethodHandle_klass()) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
345 last_vmslots = java_lang_invoke_MethodHandle::vmslots(target); |
| 710 | 346 break; |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
347 } else if (!java_lang_invoke_MethodHandle::is_instance(target)) { |
| 710 | 348 // might be klass or method |
| 349 assert(target->is_method(), "must get here with a direct ref to method"); | |
| 350 last_vmslots = methodOop(target)->size_of_parameters(); | |
| 351 break; | |
| 352 } | |
| 353 last_mh = target; | |
| 354 } | |
| 355 // If I am called with fewer VM slots than my ultimate callee, | |
| 356 // it must be that I push the additionally needed slots. | |
| 357 // Likewise if am called with more VM slots, I will pop them. | |
| 358 return (last_vmslots - this_vmslots); | |
| 359 } | |
| 360 | |
| 361 | |
| 362 // MemberName support | |
| 363 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
364 // import java_lang_invoke_MemberName.* |
| 710 | 365 enum { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
366 IS_METHOD = java_lang_invoke_MemberName::MN_IS_METHOD, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
367 IS_CONSTRUCTOR = java_lang_invoke_MemberName::MN_IS_CONSTRUCTOR, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
368 IS_FIELD = java_lang_invoke_MemberName::MN_IS_FIELD, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
369 IS_TYPE = java_lang_invoke_MemberName::MN_IS_TYPE, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
370 SEARCH_SUPERCLASSES = java_lang_invoke_MemberName::MN_SEARCH_SUPERCLASSES, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
371 SEARCH_INTERFACES = java_lang_invoke_MemberName::MN_SEARCH_INTERFACES, |
| 710 | 372 ALL_KINDS = IS_METHOD | IS_CONSTRUCTOR | IS_FIELD | IS_TYPE, |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
373 VM_INDEX_UNINITIALIZED = java_lang_invoke_MemberName::VM_INDEX_UNINITIALIZED |
| 710 | 374 }; |
| 375 | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
376 Handle MethodHandles::new_MemberName(TRAPS) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
377 Handle empty; |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
378 instanceKlassHandle k(THREAD, SystemDictionary::MemberName_klass()); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
379 if (!k->is_initialized()) k->initialize(CHECK_(empty)); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
380 return Handle(THREAD, k->allocate_instance(THREAD)); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
381 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
382 |
| 710 | 383 void MethodHandles::init_MemberName(oop mname_oop, oop target_oop) { |
| 1142 | 384 if (target_oop->klass() == SystemDictionary::reflect_Field_klass()) { |
| 710 | 385 oop clazz = java_lang_reflect_Field::clazz(target_oop); // fd.field_holder() |
| 386 int slot = java_lang_reflect_Field::slot(target_oop); // fd.index() | |
| 387 int mods = java_lang_reflect_Field::modifiers(target_oop); | |
| 388 klassOop k = java_lang_Class::as_klassOop(clazz); | |
| 389 int offset = instanceKlass::cast(k)->offset_from_fields(slot); | |
| 390 init_MemberName(mname_oop, k, accessFlags_from(mods), offset); | |
| 391 } else { | |
| 392 int decode_flags = 0; klassOop receiver_limit = NULL; | |
| 393 methodOop m = MethodHandles::decode_method(target_oop, | |
| 394 receiver_limit, decode_flags); | |
| 395 bool do_dispatch = ((decode_flags & MethodHandles::_dmf_does_dispatch) != 0); | |
| 396 init_MemberName(mname_oop, m, do_dispatch); | |
| 397 } | |
| 398 } | |
| 399 | |
| 400 void MethodHandles::init_MemberName(oop mname_oop, methodOop m, bool do_dispatch) { | |
| 401 int flags = ((m->is_initializer() ? IS_CONSTRUCTOR : IS_METHOD) | |
| 402 | (jushort)( m->access_flags().as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS )); | |
| 403 oop vmtarget = m; | |
| 404 int vmindex = methodOopDesc::invalid_vtable_index; // implies no info yet | |
| 405 if (!do_dispatch || (flags & IS_CONSTRUCTOR) || m->can_be_statically_bound()) | |
| 406 vmindex = methodOopDesc::nonvirtual_vtable_index; // implies never any dispatch | |
| 407 assert(vmindex != VM_INDEX_UNINITIALIZED, "Java sentinel value"); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
408 java_lang_invoke_MemberName::set_vmtarget(mname_oop, vmtarget); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
409 java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
410 java_lang_invoke_MemberName::set_flags(mname_oop, flags); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
411 java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(m->method_holder())->java_mirror()); |
| 710 | 412 } |
| 413 | |
| 414 void MethodHandles::init_MemberName(oop mname_oop, klassOop field_holder, AccessFlags mods, int offset) { | |
| 415 int flags = (IS_FIELD | (jushort)( mods.as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS )); | |
| 416 oop vmtarget = field_holder; | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
417 int vmindex = offset; // determines the field uniquely when combined with static bit |
| 710 | 418 assert(vmindex != VM_INDEX_UNINITIALIZED, "bad alias on vmindex"); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
419 java_lang_invoke_MemberName::set_vmtarget(mname_oop, vmtarget); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
420 java_lang_invoke_MemberName::set_vmindex(mname_oop, vmindex); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
421 java_lang_invoke_MemberName::set_flags(mname_oop, flags); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
422 java_lang_invoke_MemberName::set_clazz(mname_oop, Klass::cast(field_holder)->java_mirror()); |
| 710 | 423 } |
| 424 | |
| 425 | |
| 426 methodOop MethodHandles::decode_MemberName(oop mname, klassOop& receiver_limit_result, int& decode_flags_result) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
427 int flags = java_lang_invoke_MemberName::flags(mname); |
| 710 | 428 if ((flags & (IS_METHOD | IS_CONSTRUCTOR)) == 0) return NULL; // not invocable |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
429 oop vmtarget = java_lang_invoke_MemberName::vmtarget(mname); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
430 int vmindex = java_lang_invoke_MemberName::vmindex(mname); |
| 710 | 431 if (vmindex == VM_INDEX_UNINITIALIZED) return NULL; // not resolved |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
432 methodOop m = decode_vmtarget(vmtarget, vmindex, NULL, receiver_limit_result, decode_flags_result); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
433 oop clazz = java_lang_invoke_MemberName::clazz(mname); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
434 if (clazz != NULL && java_lang_Class::is_instance(clazz)) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
435 klassOop klass = java_lang_Class::as_klassOop(clazz); |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
436 if (klass != NULL) receiver_limit_result = klass; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
437 } |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
438 return m; |
| 710 | 439 } |
| 440 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
441 // convert the external string or reflective type to an internal signature |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
442 Symbol* MethodHandles::convert_to_signature(oop type_str, |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
443 bool polymorphic, |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
444 TRAPS) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
445 if (java_lang_invoke_MethodType::is_instance(type_str)) { |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
446 return java_lang_invoke_MethodType::as_signature(type_str, polymorphic, CHECK_NULL); |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
447 } else if (java_lang_Class::is_instance(type_str)) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
448 return java_lang_Class::as_signature(type_str, false, CHECK_NULL); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
449 } else if (java_lang_String::is_instance(type_str)) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
450 if (polymorphic) { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
451 return java_lang_String::as_symbol(type_str, CHECK_NULL); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
452 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
453 return java_lang_String::as_symbol_or_null(type_str); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
454 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
455 } else { |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
456 THROW_MSG_(vmSymbols::java_lang_InternalError(), "unrecognized type", NULL); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
457 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
458 } |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
459 |
| 710 | 460 // An unresolved member name is a mere symbolic reference. |
| 461 // Resolving it plants a vmtarget/vmindex in it, | |
| 462 // which refers dirctly to JVM internals. | |
| 463 void MethodHandles::resolve_MemberName(Handle mname, TRAPS) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
464 assert(java_lang_invoke_MemberName::is_instance(mname()), ""); |
| 710 | 465 #ifdef ASSERT |
| 466 // If this assert throws, renegotiate the sentinel value used by the Java code, | |
| 467 // so that it is distinct from any valid vtable index value, and any special | |
| 468 // values defined in methodOopDesc::VtableIndexFlag. | |
| 469 // The point of the slop is to give the Java code and the JVM some room | |
| 470 // to independently specify sentinel values. | |
| 471 const int sentinel_slop = 10; | |
| 472 const int sentinel_limit = methodOopDesc::highest_unused_vtable_index_value - sentinel_slop; | |
| 473 assert(VM_INDEX_UNINITIALIZED < sentinel_limit, "Java sentinel != JVM sentinels"); | |
| 474 #endif | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
475 if (java_lang_invoke_MemberName::vmindex(mname()) != VM_INDEX_UNINITIALIZED) |
| 710 | 476 return; // already resolved |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
477 oop defc_oop = java_lang_invoke_MemberName::clazz(mname()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
478 oop name_str = java_lang_invoke_MemberName::name(mname()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
479 oop type_str = java_lang_invoke_MemberName::type(mname()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
480 int flags = java_lang_invoke_MemberName::flags(mname()); |
| 710 | 481 |
| 482 if (defc_oop == NULL || name_str == NULL || type_str == NULL) { | |
| 483 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "nothing to resolve"); | |
| 484 } | |
| 485 klassOop defc_klassOop = java_lang_Class::as_klassOop(defc_oop); | |
| 486 defc_oop = NULL; // safety | |
| 487 if (defc_klassOop == NULL) return; // a primitive; no resolution possible | |
| 488 if (!Klass::cast(defc_klassOop)->oop_is_instance()) { | |
| 489 if (!Klass::cast(defc_klassOop)->oop_is_array()) return; | |
| 1142 | 490 defc_klassOop = SystemDictionary::Object_klass(); |
| 710 | 491 } |
| 492 instanceKlassHandle defc(THREAD, defc_klassOop); | |
| 493 defc_klassOop = NULL; // safety | |
| 494 if (defc.is_null()) { | |
| 495 THROW_MSG(vmSymbols::java_lang_InternalError(), "primitive class"); | |
| 496 } | |
| 497 defc->link_class(CHECK); | |
| 498 | |
| 499 // convert the external string name to an internal symbol | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
500 TempNewSymbol name = java_lang_String::as_symbol_or_null(name_str); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
501 if (name == NULL) return; // no such name |
| 710 | 502 name_str = NULL; // safety |
| 503 | |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
504 Handle polymorphic_method_type; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
505 bool polymorphic_signature = false; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
506 if ((flags & ALL_KINDS) == IS_METHOD && |
|
2001
f2da85a9b08e
7001363: java/dyn/InvokeDynamic should not be a well-known class in the JVM
twisti
parents:
1972
diff
changeset
|
507 (defc() == SystemDictionary::MethodHandle_klass() && |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
508 methodOopDesc::is_method_handle_invoke_name(name))) |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
509 polymorphic_signature = true; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
510 |
| 710 | 511 // convert the external string or reflective type to an internal signature |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
512 TempNewSymbol type = convert_to_signature(type_str, polymorphic_signature, CHECK); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
513 if (java_lang_invoke_MethodType::is_instance(type_str) && polymorphic_signature) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
514 polymorphic_method_type = Handle(THREAD, type_str); //preserve exactly |
| 710 | 515 } |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
516 |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
517 if (type == NULL) return; // no such signature exists in the VM |
| 710 | 518 type_str = NULL; // safety |
| 519 | |
| 520 // Time to do the lookup. | |
| 521 switch (flags & ALL_KINDS) { | |
| 522 case IS_METHOD: | |
| 523 { | |
| 524 CallInfo result; | |
| 525 { | |
| 526 EXCEPTION_MARK; | |
| 527 if ((flags & JVM_ACC_STATIC) != 0) { | |
| 528 LinkResolver::resolve_static_call(result, | |
| 529 defc, name, type, KlassHandle(), false, false, THREAD); | |
| 530 } else if (defc->is_interface()) { | |
| 531 LinkResolver::resolve_interface_call(result, Handle(), defc, | |
| 532 defc, name, type, KlassHandle(), false, false, THREAD); | |
| 533 } else { | |
| 534 LinkResolver::resolve_virtual_call(result, Handle(), defc, | |
| 535 defc, name, type, KlassHandle(), false, false, THREAD); | |
| 536 } | |
| 537 if (HAS_PENDING_EXCEPTION) { | |
| 538 CLEAR_PENDING_EXCEPTION; | |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
539 break; // go to second chance |
| 710 | 540 } |
| 541 } | |
| 542 methodHandle m = result.resolved_method(); | |
| 543 oop vmtarget = NULL; | |
| 544 int vmindex = methodOopDesc::nonvirtual_vtable_index; | |
| 545 if (defc->is_interface()) { | |
| 546 vmindex = klassItable::compute_itable_index(m()); | |
| 547 assert(vmindex >= 0, ""); | |
| 548 } else if (result.has_vtable_index()) { | |
| 549 vmindex = result.vtable_index(); | |
| 550 assert(vmindex >= 0, ""); | |
| 551 } | |
| 552 assert(vmindex != VM_INDEX_UNINITIALIZED, ""); | |
| 553 if (vmindex < 0) { | |
| 554 assert(result.is_statically_bound(), ""); | |
| 555 vmtarget = m(); | |
| 556 } else { | |
| 557 vmtarget = result.resolved_klass()->as_klassOop(); | |
| 558 } | |
| 559 int mods = (m->access_flags().as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
560 java_lang_invoke_MemberName::set_vmtarget(mname(), vmtarget); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
561 java_lang_invoke_MemberName::set_vmindex(mname(), vmindex); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
562 java_lang_invoke_MemberName::set_modifiers(mname(), mods); |
| 710 | 563 DEBUG_ONLY(int junk; klassOop junk2); |
| 564 assert(decode_MemberName(mname(), junk2, junk) == result.resolved_method()(), | |
| 565 "properly stored for later decoding"); | |
| 566 return; | |
| 567 } | |
| 568 case IS_CONSTRUCTOR: | |
| 569 { | |
| 570 CallInfo result; | |
| 571 { | |
| 572 EXCEPTION_MARK; | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
573 if (name == vmSymbols::object_initializer_name()) { |
| 710 | 574 LinkResolver::resolve_special_call(result, |
| 575 defc, name, type, KlassHandle(), false, THREAD); | |
| 576 } else { | |
| 577 break; // will throw after end of switch | |
| 578 } | |
| 579 if (HAS_PENDING_EXCEPTION) { | |
| 580 CLEAR_PENDING_EXCEPTION; | |
| 581 return; | |
| 582 } | |
| 583 } | |
| 584 assert(result.is_statically_bound(), ""); | |
| 585 methodHandle m = result.resolved_method(); | |
| 586 oop vmtarget = m(); | |
| 587 int vmindex = methodOopDesc::nonvirtual_vtable_index; | |
| 588 int mods = (m->access_flags().as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
589 java_lang_invoke_MemberName::set_vmtarget(mname(), vmtarget); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
590 java_lang_invoke_MemberName::set_vmindex(mname(), vmindex); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
591 java_lang_invoke_MemberName::set_modifiers(mname(), mods); |
| 710 | 592 DEBUG_ONLY(int junk; klassOop junk2); |
| 593 assert(decode_MemberName(mname(), junk2, junk) == result.resolved_method()(), | |
| 594 "properly stored for later decoding"); | |
| 595 return; | |
| 596 } | |
| 597 case IS_FIELD: | |
| 598 { | |
| 599 // This is taken from LinkResolver::resolve_field, sans access checks. | |
| 600 fieldDescriptor fd; // find_field initializes fd if found | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
601 KlassHandle sel_klass(THREAD, instanceKlass::cast(defc())->find_field(name, type, &fd)); |
| 710 | 602 // check if field exists; i.e., if a klass containing the field def has been selected |
| 603 if (sel_klass.is_null()) return; | |
| 604 oop vmtarget = sel_klass->as_klassOop(); | |
| 605 int vmindex = fd.offset(); | |
| 606 int mods = (fd.access_flags().as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS); | |
| 607 if (vmindex == VM_INDEX_UNINITIALIZED) break; // should not happen | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
608 java_lang_invoke_MemberName::set_vmtarget(mname(), vmtarget); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
609 java_lang_invoke_MemberName::set_vmindex(mname(), vmindex); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
610 java_lang_invoke_MemberName::set_modifiers(mname(), mods); |
| 710 | 611 return; |
| 612 } | |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
613 default: |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
614 THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format"); |
| 710 | 615 } |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
616 |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
617 // Second chance. |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
618 if (polymorphic_method_type.not_null()) { |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
619 // Look on a non-null class loader. |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
620 Handle cur_class_loader; |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
621 const int nptypes = java_lang_invoke_MethodType::ptype_count(polymorphic_method_type()); |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
622 for (int i = 0; i <= nptypes; i++) { |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
623 oop type_mirror; |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
624 if (i < nptypes) type_mirror = java_lang_invoke_MethodType::ptype(polymorphic_method_type(), i); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
625 else type_mirror = java_lang_invoke_MethodType::rtype(polymorphic_method_type()); |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
626 klassOop example_type = java_lang_Class::as_klassOop(type_mirror); |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
627 if (example_type == NULL) continue; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
628 oop class_loader = Klass::cast(example_type)->class_loader(); |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
629 if (class_loader == NULL || class_loader == cur_class_loader()) continue; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
630 cur_class_loader = Handle(THREAD, class_loader); |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
631 methodOop m = SystemDictionary::find_method_handle_invoke(name, |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
632 type, |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
633 KlassHandle(THREAD, example_type), |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
634 THREAD); |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
635 if (HAS_PENDING_EXCEPTION) { |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
636 CLEAR_PENDING_EXCEPTION; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
637 m = NULL; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
638 // try again with a different class loader... |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
639 } |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
640 if (m != NULL) { |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
641 int mods = (m->access_flags().as_short() & JVM_RECOGNIZED_METHOD_MODIFIERS); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
642 java_lang_invoke_MemberName::set_vmtarget(mname(), m); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
643 java_lang_invoke_MemberName::set_vmindex(mname(), m->vtable_index()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
644 java_lang_invoke_MemberName::set_modifiers(mname(), mods); |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
645 return; |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
646 } |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
647 } |
|
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
648 } |
| 710 | 649 } |
| 650 | |
| 651 // Conversely, a member name which is only initialized from JVM internals | |
| 652 // may have null defc, name, and type fields. | |
| 653 // Resolving it plants a vmtarget/vmindex in it, | |
| 654 // which refers directly to JVM internals. | |
| 655 void MethodHandles::expand_MemberName(Handle mname, int suppress, TRAPS) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
656 assert(java_lang_invoke_MemberName::is_instance(mname()), ""); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
657 oop vmtarget = java_lang_invoke_MemberName::vmtarget(mname()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
658 int vmindex = java_lang_invoke_MemberName::vmindex(mname()); |
| 710 | 659 if (vmtarget == NULL || vmindex == VM_INDEX_UNINITIALIZED) { |
| 660 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "nothing to expand"); | |
| 661 } | |
| 662 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
663 bool have_defc = (java_lang_invoke_MemberName::clazz(mname()) != NULL); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
664 bool have_name = (java_lang_invoke_MemberName::name(mname()) != NULL); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
665 bool have_type = (java_lang_invoke_MemberName::type(mname()) != NULL); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
666 int flags = java_lang_invoke_MemberName::flags(mname()); |
| 710 | 667 |
| 668 if (suppress != 0) { | |
| 669 if (suppress & _suppress_defc) have_defc = true; | |
| 670 if (suppress & _suppress_name) have_name = true; | |
| 671 if (suppress & _suppress_type) have_type = true; | |
| 672 } | |
| 673 | |
| 674 if (have_defc && have_name && have_type) return; // nothing needed | |
| 675 | |
| 676 switch (flags & ALL_KINDS) { | |
| 677 case IS_METHOD: | |
| 678 case IS_CONSTRUCTOR: | |
| 679 { | |
| 680 klassOop receiver_limit = NULL; | |
| 681 int decode_flags = 0; | |
| 682 methodHandle m(THREAD, decode_vmtarget(vmtarget, vmindex, NULL, | |
| 683 receiver_limit, decode_flags)); | |
| 684 if (m.is_null()) break; | |
| 685 if (!have_defc) { | |
| 686 klassOop defc = m->method_holder(); | |
| 687 if (receiver_limit != NULL && receiver_limit != defc | |
| 688 && Klass::cast(receiver_limit)->is_subtype_of(defc)) | |
| 689 defc = receiver_limit; | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
690 java_lang_invoke_MemberName::set_clazz(mname(), Klass::cast(defc)->java_mirror()); |
| 710 | 691 } |
| 692 if (!have_name) { | |
| 693 //not java_lang_String::create_from_symbol; let's intern member names | |
| 694 Handle name = StringTable::intern(m->name(), CHECK); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
695 java_lang_invoke_MemberName::set_name(mname(), name()); |
| 710 | 696 } |
| 697 if (!have_type) { | |
| 698 Handle type = java_lang_String::create_from_symbol(m->signature(), CHECK); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
699 java_lang_invoke_MemberName::set_type(mname(), type()); |
| 710 | 700 } |
| 701 return; | |
| 702 } | |
| 703 case IS_FIELD: | |
| 704 { | |
| 705 // This is taken from LinkResolver::resolve_field, sans access checks. | |
| 706 if (!vmtarget->is_klass()) break; | |
| 707 if (!Klass::cast((klassOop) vmtarget)->oop_is_instance()) break; | |
| 708 instanceKlassHandle defc(THREAD, (klassOop) vmtarget); | |
| 709 bool is_static = ((flags & JVM_ACC_STATIC) != 0); | |
| 710 fieldDescriptor fd; // find_field initializes fd if found | |
| 711 if (!defc->find_field_from_offset(vmindex, is_static, &fd)) | |
| 712 break; // cannot expand | |
| 713 if (!have_defc) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
714 java_lang_invoke_MemberName::set_clazz(mname(), defc->java_mirror()); |
| 710 | 715 } |
| 716 if (!have_name) { | |
| 717 //not java_lang_String::create_from_symbol; let's intern member names | |
| 718 Handle name = StringTable::intern(fd.name(), CHECK); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
719 java_lang_invoke_MemberName::set_name(mname(), name()); |
| 710 | 720 } |
| 721 if (!have_type) { | |
| 722 Handle type = java_lang_String::create_from_symbol(fd.signature(), CHECK); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
723 java_lang_invoke_MemberName::set_type(mname(), type()); |
| 710 | 724 } |
| 725 return; | |
| 726 } | |
| 727 } | |
| 728 THROW_MSG(vmSymbols::java_lang_InternalError(), "unrecognized MemberName format"); | |
| 729 } | |
| 730 | |
| 731 int MethodHandles::find_MemberNames(klassOop k, | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
732 Symbol* name, Symbol* sig, |
| 710 | 733 int mflags, klassOop caller, |
| 734 int skip, objArrayOop results) { | |
| 735 DEBUG_ONLY(No_Safepoint_Verifier nsv); | |
| 736 // this code contains no safepoints! | |
| 737 | |
| 738 // %%% take caller into account! | |
| 739 | |
| 740 if (k == NULL || !Klass::cast(k)->oop_is_instance()) return -1; | |
| 741 | |
| 742 int rfill = 0, rlimit = results->length(), rskip = skip; | |
| 743 // overflow measurement: | |
| 744 int overflow = 0, overflow_limit = MAX2(1000, rlimit); | |
| 745 | |
| 746 int match_flags = mflags; | |
| 747 bool search_superc = ((match_flags & SEARCH_SUPERCLASSES) != 0); | |
| 748 bool search_intfc = ((match_flags & SEARCH_INTERFACES) != 0); | |
| 749 bool local_only = !(search_superc | search_intfc); | |
| 750 bool classes_only = false; | |
| 751 | |
| 752 if (name != NULL) { | |
| 753 if (name->utf8_length() == 0) return 0; // a match is not possible | |
| 754 } | |
| 755 if (sig != NULL) { | |
| 756 if (sig->utf8_length() == 0) return 0; // a match is not possible | |
| 757 if (sig->byte_at(0) == '(') | |
| 758 match_flags &= ~(IS_FIELD | IS_TYPE); | |
| 759 else | |
| 760 match_flags &= ~(IS_CONSTRUCTOR | IS_METHOD); | |
| 761 } | |
| 762 | |
| 763 if ((match_flags & IS_TYPE) != 0) { | |
| 764 // NYI, and Core Reflection works quite well for this query | |
| 765 } | |
| 766 | |
| 767 if ((match_flags & IS_FIELD) != 0) { | |
| 768 for (FieldStream st(k, local_only, !search_intfc); !st.eos(); st.next()) { | |
| 769 if (name != NULL && st.name() != name) | |
| 770 continue; | |
| 771 if (sig != NULL && st.signature() != sig) | |
| 772 continue; | |
| 773 // passed the filters | |
| 774 if (rskip > 0) { | |
| 775 --rskip; | |
| 776 } else if (rfill < rlimit) { | |
| 777 oop result = results->obj_at(rfill++); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
778 if (!java_lang_invoke_MemberName::is_instance(result)) |
| 710 | 779 return -99; // caller bug! |
| 780 MethodHandles::init_MemberName(result, st.klass()->as_klassOop(), st.access_flags(), st.offset()); | |
| 781 } else if (++overflow >= overflow_limit) { | |
| 782 match_flags = 0; break; // got tired of looking at overflow | |
| 783 } | |
| 784 } | |
| 785 } | |
| 786 | |
| 787 if ((match_flags & (IS_METHOD | IS_CONSTRUCTOR)) != 0) { | |
| 788 // watch out for these guys: | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
789 Symbol* init_name = vmSymbols::object_initializer_name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
790 Symbol* clinit_name = vmSymbols::class_initializer_name(); |
| 710 | 791 if (name == clinit_name) clinit_name = NULL; // hack for exposing <clinit> |
| 792 bool negate_name_test = false; | |
| 793 // fix name so that it captures the intention of IS_CONSTRUCTOR | |
| 794 if (!(match_flags & IS_METHOD)) { | |
| 795 // constructors only | |
| 796 if (name == NULL) { | |
| 797 name = init_name; | |
| 798 } else if (name != init_name) { | |
| 799 return 0; // no constructors of this method name | |
| 800 } | |
| 801 } else if (!(match_flags & IS_CONSTRUCTOR)) { | |
| 802 // methods only | |
| 803 if (name == NULL) { | |
| 804 name = init_name; | |
| 805 negate_name_test = true; // if we see the name, we *omit* the entry | |
| 806 } else if (name == init_name) { | |
| 807 return 0; // no methods of this constructor name | |
| 808 } | |
| 809 } else { | |
| 810 // caller will accept either sort; no need to adjust name | |
| 811 } | |
| 812 for (MethodStream st(k, local_only, !search_intfc); !st.eos(); st.next()) { | |
| 813 methodOop m = st.method(); | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
814 Symbol* m_name = m->name(); |
| 710 | 815 if (m_name == clinit_name) |
| 816 continue; | |
| 817 if (name != NULL && ((m_name != name) ^ negate_name_test)) | |
| 818 continue; | |
| 819 if (sig != NULL && m->signature() != sig) | |
| 820 continue; | |
| 821 // passed the filters | |
| 822 if (rskip > 0) { | |
| 823 --rskip; | |
| 824 } else if (rfill < rlimit) { | |
| 825 oop result = results->obj_at(rfill++); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
826 if (!java_lang_invoke_MemberName::is_instance(result)) |
| 710 | 827 return -99; // caller bug! |
| 828 MethodHandles::init_MemberName(result, m, true); | |
| 829 } else if (++overflow >= overflow_limit) { | |
| 830 match_flags = 0; break; // got tired of looking at overflow | |
| 831 } | |
| 832 } | |
| 833 } | |
| 834 | |
| 835 // return number of elements we at leasted wanted to initialize | |
| 836 return rfill + overflow; | |
| 837 } | |
| 838 | |
| 839 | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
840 // Decode this java.lang.Class object into an instanceKlass, if possible. |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
841 // Throw IAE if not |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
842 instanceKlassHandle MethodHandles::resolve_instance_klass(oop java_mirror_oop, TRAPS) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
843 instanceKlassHandle empty; |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
844 klassOop caller = NULL; |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
845 if (java_lang_Class::is_instance(java_mirror_oop)) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
846 caller = java_lang_Class::as_klassOop(java_mirror_oop); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
847 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
848 if (caller == NULL || !Klass::cast(caller)->oop_is_instance()) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
849 THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), "not a class", empty); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
850 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
851 return instanceKlassHandle(THREAD, caller); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
852 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
853 |
| 710 | 854 |
| 855 | |
| 856 // Decode the vmtarget field of a method handle. | |
| 857 // Sanitize out methodOops, klassOops, and any other non-Java data. | |
| 858 // This is for debugging and reflection. | |
| 859 oop MethodHandles::encode_target(Handle mh, int format, TRAPS) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
860 assert(java_lang_invoke_MethodHandle::is_instance(mh()), "must be a MH"); |
| 710 | 861 if (format == ETF_HANDLE_OR_METHOD_NAME) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
862 oop target = java_lang_invoke_MethodHandle::vmtarget(mh()); |
| 710 | 863 if (target == NULL) { |
| 864 return NULL; // unformed MH | |
| 865 } | |
| 866 klassOop tklass = target->klass(); | |
| 1142 | 867 if (Klass::cast(tklass)->is_subclass_of(SystemDictionary::Object_klass())) { |
| 710 | 868 return target; // target is another MH (or something else?) |
| 869 } | |
| 870 } | |
| 871 if (format == ETF_DIRECT_HANDLE) { | |
| 872 oop target = mh(); | |
| 873 for (;;) { | |
| 874 if (target->klass() == SystemDictionary::DirectMethodHandle_klass()) { | |
| 875 return target; | |
| 876 } | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
877 if (!java_lang_invoke_MethodHandle::is_instance(target)){ |
| 710 | 878 return NULL; // unformed MH |
| 879 } | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
880 target = java_lang_invoke_MethodHandle::vmtarget(target); |
| 710 | 881 } |
| 882 } | |
| 883 // cases of metadata in MH.vmtarget: | |
| 884 // - AMH can have methodOop for static invoke with bound receiver | |
| 885 // - DMH can have methodOop for static invoke (on variable receiver) | |
| 886 // - DMH can have klassOop for dispatched (non-static) invoke | |
| 887 klassOop receiver_limit = NULL; | |
| 888 int decode_flags = 0; | |
| 889 methodOop m = decode_MethodHandle(mh(), receiver_limit, decode_flags); | |
| 890 if (m == NULL) return NULL; | |
| 891 switch (format) { | |
| 892 case ETF_REFLECT_METHOD: | |
| 893 // same as jni_ToReflectedMethod: | |
| 894 if (m->is_initializer()) { | |
| 895 return Reflection::new_constructor(m, THREAD); | |
| 896 } else { | |
| 897 return Reflection::new_method(m, UseNewReflection, false, THREAD); | |
| 898 } | |
| 899 | |
| 900 case ETF_HANDLE_OR_METHOD_NAME: // method, not handle | |
| 901 case ETF_METHOD_NAME: | |
| 902 { | |
| 903 if (SystemDictionary::MemberName_klass() == NULL) break; | |
| 904 instanceKlassHandle mname_klass(THREAD, SystemDictionary::MemberName_klass()); | |
| 905 mname_klass->initialize(CHECK_NULL); | |
| 906 Handle mname = mname_klass->allocate_instance_handle(CHECK_NULL); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
907 java_lang_invoke_MemberName::set_vmindex(mname(), VM_INDEX_UNINITIALIZED); |
| 710 | 908 bool do_dispatch = ((decode_flags & MethodHandles::_dmf_does_dispatch) != 0); |
| 909 init_MemberName(mname(), m, do_dispatch); | |
| 910 expand_MemberName(mname, 0, CHECK_NULL); | |
| 911 return mname(); | |
| 912 } | |
| 913 } | |
| 914 | |
| 915 // Unknown format code. | |
| 916 char msg[50]; | |
| 917 jio_snprintf(msg, sizeof(msg), "unknown getTarget format=%d", format); | |
| 918 THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), msg); | |
| 919 } | |
| 920 | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
921 static const char* always_null_names[] = { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
922 "java/lang/Void", |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
923 "java/lang/Null", |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
924 //"java/lang/Nothing", |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
925 "sun/dyn/empty/Empty", |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
926 "sun/invoke/empty/Empty", |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
927 NULL |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
928 }; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
929 |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
930 static bool is_always_null_type(klassOop klass) { |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
931 if (klass == NULL) return false; // safety |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
932 if (!Klass::cast(klass)->oop_is_instance()) return false; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
933 instanceKlass* ik = instanceKlass::cast(klass); |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
934 // Must be on the boot class path: |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
935 if (ik->class_loader() != NULL) return false; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
936 // Check the name. |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
937 Symbol* name = ik->name(); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
938 for (int i = 0; ; i++) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
939 const char* test_name = always_null_names[i]; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
940 if (test_name == NULL) break; |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
941 if (name->equals(test_name)) |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
942 return true; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
943 } |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
944 return false; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
945 } |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
946 |
| 710 | 947 bool MethodHandles::class_cast_needed(klassOop src, klassOop dst) { |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
948 if (dst == NULL) return true; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
949 if (src == NULL) return (dst != SystemDictionary::Object_klass()); |
| 1142 | 950 if (src == dst || dst == SystemDictionary::Object_klass()) |
| 710 | 951 return false; // quickest checks |
| 952 Klass* srck = Klass::cast(src); | |
| 953 Klass* dstk = Klass::cast(dst); | |
| 954 if (dstk->is_interface()) { | |
| 955 // interface receivers can safely be viewed as untyped, | |
| 956 // because interface calls always include a dynamic check | |
| 1142 | 957 //dstk = Klass::cast(SystemDictionary::Object_klass()); |
| 710 | 958 return false; |
| 959 } | |
| 960 if (srck->is_interface()) { | |
| 961 // interface arguments must be viewed as untyped | |
| 1142 | 962 //srck = Klass::cast(SystemDictionary::Object_klass()); |
| 710 | 963 return true; |
| 964 } | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
965 if (is_always_null_type(src)) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
966 // some source types are known to be never instantiated; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
967 // they represent references which are always null |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
968 // such null references never fail to convert safely |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
969 return false; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
970 } |
| 710 | 971 return !srck->is_subclass_of(dstk->as_klassOop()); |
| 972 } | |
| 973 | |
| 974 static oop object_java_mirror() { | |
| 1142 | 975 return Klass::cast(SystemDictionary::Object_klass())->java_mirror(); |
| 710 | 976 } |
| 977 | |
| 978 bool MethodHandles::same_basic_type_for_arguments(BasicType src, | |
| 979 BasicType dst, | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
980 bool raw, |
| 710 | 981 bool for_return) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
982 if (for_return) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
983 // return values can always be forgotten: |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
984 if (dst == T_VOID) return true; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
985 if (src == T_VOID) return raw && (dst == T_INT); |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
986 // We allow caller to receive a garbage int, which is harmless. |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
987 // This trick is pulled by trusted code (see VerifyType.canPassRaw). |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
988 } |
| 710 | 989 assert(src != T_VOID && dst != T_VOID, "should not be here"); |
| 990 if (src == dst) return true; | |
| 991 if (type2size[src] != type2size[dst]) return false; | |
|
1912
8213b0f5c92d
6981777: implement JSR 292 EG adjustments from summer 2010
jrose
parents:
1849
diff
changeset
|
992 if (src == T_OBJECT || dst == T_OBJECT) return false; |
|
8213b0f5c92d
6981777: implement JSR 292 EG adjustments from summer 2010
jrose
parents:
1849
diff
changeset
|
993 if (raw) return true; // bitwise reinterpretation; caller guarantees safety |
| 710 | 994 // allow reinterpretation casts for integral widening |
| 995 if (is_subword_type(src)) { // subwords can fit in int or other subwords | |
| 996 if (dst == T_INT) // any subword fits in an int | |
| 997 return true; | |
| 998 if (src == T_BOOLEAN) // boolean fits in any subword | |
| 999 return is_subword_type(dst); | |
| 1000 if (src == T_BYTE && dst == T_SHORT) | |
| 1001 return true; // remaining case: byte fits in short | |
| 1002 } | |
| 1003 // allow float/fixed reinterpretation casts | |
| 1004 if (src == T_FLOAT) return dst == T_INT; | |
| 1005 if (src == T_INT) return dst == T_FLOAT; | |
| 1006 if (src == T_DOUBLE) return dst == T_LONG; | |
| 1007 if (src == T_LONG) return dst == T_DOUBLE; | |
| 1008 return false; | |
| 1009 } | |
| 1010 | |
| 1011 const char* MethodHandles::check_method_receiver(methodOop m, | |
| 1012 klassOop passed_recv_type) { | |
| 1013 assert(!m->is_static(), "caller resp."); | |
| 1014 if (passed_recv_type == NULL) | |
| 1015 return "receiver type is primitive"; | |
| 1016 if (class_cast_needed(passed_recv_type, m->method_holder())) { | |
| 1017 Klass* formal = Klass::cast(m->method_holder()); | |
| 1018 return SharedRuntime::generate_class_cast_message("receiver type", | |
| 1019 formal->external_name()); | |
| 1020 } | |
| 1021 return NULL; // checks passed | |
| 1022 } | |
| 1023 | |
| 1024 // Verify that m's signature can be called type-safely by a method handle | |
| 1025 // of the given method type 'mtype'. | |
| 1026 // It takes a TRAPS argument because it must perform symbol lookups. | |
| 1027 void MethodHandles::verify_method_signature(methodHandle m, | |
| 1028 Handle mtype, | |
| 1029 int first_ptype_pos, | |
| 1030 KlassHandle insert_ptype, | |
| 1031 TRAPS) { | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1032 Handle mhi_type; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1033 if (m->is_method_handle_invoke()) { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1034 // use this more exact typing instead of the symbolic signature: |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1035 mhi_type = Handle(THREAD, m->method_handle_type()); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1036 } |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1037 objArrayHandle ptypes(THREAD, java_lang_invoke_MethodType::ptypes(mtype())); |
| 710 | 1038 int pnum = first_ptype_pos; |
| 1039 int pmax = ptypes->length(); | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1040 int anum = 0; // method argument |
| 710 | 1041 const char* err = NULL; |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
1042 ResourceMark rm(THREAD); |
| 710 | 1043 for (SignatureStream ss(m->signature()); !ss.is_done(); ss.next()) { |
| 1044 oop ptype_oop = NULL; | |
| 1045 if (ss.at_return_type()) { | |
| 1046 if (pnum != pmax) | |
| 1047 { err = "too many arguments"; break; } | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1048 ptype_oop = java_lang_invoke_MethodType::rtype(mtype()); |
| 710 | 1049 } else { |
| 1050 if (pnum >= pmax) | |
| 1051 { err = "not enough arguments"; break; } | |
| 1052 if (pnum >= 0) | |
| 1053 ptype_oop = ptypes->obj_at(pnum); | |
| 1054 else if (insert_ptype.is_null()) | |
| 1055 ptype_oop = NULL; | |
| 1056 else | |
| 1057 ptype_oop = insert_ptype->java_mirror(); | |
| 1058 pnum += 1; | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1059 anum += 1; |
| 710 | 1060 } |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1061 KlassHandle pklass; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1062 BasicType ptype = T_OBJECT; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1063 bool have_ptype = false; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1064 // missing ptype_oop does not match any non-reference; use Object to report the error |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1065 pklass = SystemDictionaryHandles::Object_klass(); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1066 if (ptype_oop != NULL) { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1067 have_ptype = true; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1068 klassOop pklass_oop = NULL; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1069 ptype = java_lang_Class::as_BasicType(ptype_oop, &pklass_oop); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1070 pklass = KlassHandle(THREAD, pklass_oop); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1071 } |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1072 ptype_oop = NULL; //done with this |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1073 KlassHandle aklass; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1074 BasicType atype = ss.type(); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1075 if (atype == T_ARRAY) atype = T_OBJECT; // fold all refs to T_OBJECT |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1076 if (atype == T_OBJECT) { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1077 if (!have_ptype) { |
| 710 | 1078 // null matches any reference |
| 1079 continue; | |
| 1080 } | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1081 if (mhi_type.is_null()) { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1082 // If we fail to resolve types at this point, we will usually throw an error. |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1083 TempNewSymbol name = ss.as_symbol_or_null(); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1084 if (name != NULL) { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1085 instanceKlass* mk = instanceKlass::cast(m->method_holder()); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1086 Handle loader(THREAD, mk->class_loader()); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1087 Handle domain(THREAD, mk->protection_domain()); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1088 klassOop aklass_oop = SystemDictionary::resolve_or_null(name, loader, domain, CHECK); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1089 if (aklass_oop != NULL) |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1090 aklass = KlassHandle(THREAD, aklass_oop); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1091 } |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1092 } else { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1093 // for method handle invokers we don't look at the name in the signature |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1094 oop atype_oop; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1095 if (ss.at_return_type()) |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1096 atype_oop = java_lang_invoke_MethodType::rtype(mhi_type()); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1097 else |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1098 atype_oop = java_lang_invoke_MethodType::ptype(mhi_type(), anum-1); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1099 klassOop aklass_oop = NULL; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1100 atype = java_lang_Class::as_BasicType(atype_oop, &aklass_oop); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1101 aklass = KlassHandle(THREAD, aklass_oop); |
|
1508
2ffde6cfe049
6939196: method handle signatures off the boot class path get linkage errors
jrose
parents:
1507
diff
changeset
|
1102 } |
| 710 | 1103 } |
| 1104 if (!ss.at_return_type()) { | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1105 err = check_argument_type_change(ptype, pklass(), atype, aklass(), anum); |
| 710 | 1106 } else { |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1107 err = check_return_type_change(atype, aklass(), ptype, pklass()); // note reversal! |
| 710 | 1108 } |
| 1109 if (err != NULL) break; | |
| 1110 } | |
| 1111 | |
| 1112 if (err != NULL) { | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1113 #ifndef PRODUCT |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1114 if (PrintMiscellaneous && (Verbose || WizardMode)) { |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1115 tty->print("*** verify_method_signature failed: "); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1116 java_lang_invoke_MethodType::print_signature(mtype(), tty); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1117 tty->cr(); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1118 tty->print_cr(" first_ptype_pos = %d, insert_ptype = "UINTX_FORMAT, first_ptype_pos, insert_ptype()); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1119 tty->print(" Failing method: "); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1120 m->print(); |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1121 } |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1122 #endif //PRODUCT |
| 710 | 1123 THROW_MSG(vmSymbols::java_lang_InternalError(), err); |
| 1124 } | |
| 1125 } | |
| 1126 | |
| 1127 // Main routine for verifying the MethodHandle.type of a proposed | |
| 1128 // direct or bound-direct method handle. | |
| 1129 void MethodHandles::verify_method_type(methodHandle m, | |
| 1130 Handle mtype, | |
| 1131 bool has_bound_recv, | |
| 1132 KlassHandle bound_recv_type, | |
| 1133 TRAPS) { | |
| 1134 bool m_needs_receiver = !m->is_static(); | |
| 1135 | |
| 1136 const char* err = NULL; | |
| 1137 | |
| 1138 int first_ptype_pos = m_needs_receiver ? 1 : 0; | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1139 if (has_bound_recv) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1140 first_ptype_pos -= 1; // ptypes do not include the bound argument; start earlier in them |
| 710 | 1141 if (m_needs_receiver && bound_recv_type.is_null()) |
| 1142 { err = "bound receiver is not an object"; goto die; } | |
| 1143 } | |
| 1144 | |
| 1145 if (m_needs_receiver && err == NULL) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1146 objArrayOop ptypes = java_lang_invoke_MethodType::ptypes(mtype()); |
| 710 | 1147 if (ptypes->length() < first_ptype_pos) |
| 1148 { err = "receiver argument is missing"; goto die; } | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1149 if (has_bound_recv) |
| 710 | 1150 err = check_method_receiver(m(), bound_recv_type->as_klassOop()); |
| 1151 else | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1152 err = check_method_receiver(m(), java_lang_Class::as_klassOop(ptypes->obj_at(first_ptype_pos-1))); |
| 710 | 1153 if (err != NULL) goto die; |
| 1154 } | |
| 1155 | |
| 1156 // Check the other arguments for mistypes. | |
| 1157 verify_method_signature(m, mtype, first_ptype_pos, bound_recv_type, CHECK); | |
| 1158 return; | |
| 1159 | |
| 1160 die: | |
| 1161 THROW_MSG(vmSymbols::java_lang_InternalError(), err); | |
| 1162 } | |
| 1163 | |
| 1164 void MethodHandles::verify_vmslots(Handle mh, TRAPS) { | |
| 1165 // Verify vmslots. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1166 int check_slots = argument_slot_count(java_lang_invoke_MethodHandle::type(mh())); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1167 if (java_lang_invoke_MethodHandle::vmslots(mh()) != check_slots) { |
| 710 | 1168 THROW_MSG(vmSymbols::java_lang_InternalError(), "bad vmslots in BMH"); |
| 1169 } | |
| 1170 } | |
| 1171 | |
| 1172 void MethodHandles::verify_vmargslot(Handle mh, int argnum, int argslot, TRAPS) { | |
| 1173 // Verify that argslot points at the given argnum. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1174 int check_slot = argument_slot(java_lang_invoke_MethodHandle::type(mh()), argnum); |
| 710 | 1175 if (argslot != check_slot || argslot < 0) { |
| 1176 const char* fmt = "for argnum of %d, vmargslot is %d, should be %d"; | |
| 1177 size_t msglen = strlen(fmt) + 3*11 + 1; | |
| 1178 char* msg = NEW_RESOURCE_ARRAY(char, msglen); | |
| 1179 jio_snprintf(msg, msglen, fmt, argnum, argslot, check_slot); | |
| 1180 THROW_MSG(vmSymbols::java_lang_InternalError(), msg); | |
| 1181 } | |
| 1182 } | |
| 1183 | |
| 1184 // Verify the correspondence between two method types. | |
| 1185 // Apart from the advertised changes, caller method type X must | |
| 1186 // be able to invoke the callee method Y type with no violations | |
| 1187 // of type integrity. | |
| 1188 // Return NULL if all is well, else a short error message. | |
| 1189 const char* MethodHandles::check_method_type_change(oop src_mtype, int src_beg, int src_end, | |
| 1190 int insert_argnum, oop insert_type, | |
| 1191 int change_argnum, oop change_type, | |
| 1192 int delete_argnum, | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1193 oop dst_mtype, int dst_beg, int dst_end, |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1194 bool raw) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1195 objArrayOop src_ptypes = java_lang_invoke_MethodType::ptypes(src_mtype); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1196 objArrayOop dst_ptypes = java_lang_invoke_MethodType::ptypes(dst_mtype); |
| 710 | 1197 |
| 1198 int src_max = src_ptypes->length(); | |
| 1199 int dst_max = dst_ptypes->length(); | |
| 1200 | |
| 1201 if (src_end == -1) src_end = src_max; | |
| 1202 if (dst_end == -1) dst_end = dst_max; | |
| 1203 | |
| 1204 assert(0 <= src_beg && src_beg <= src_end && src_end <= src_max, "oob"); | |
| 1205 assert(0 <= dst_beg && dst_beg <= dst_end && dst_end <= dst_max, "oob"); | |
| 1206 | |
| 1207 // pending actions; set to -1 when done: | |
| 1208 int ins_idx = insert_argnum, chg_idx = change_argnum, del_idx = delete_argnum; | |
| 1209 | |
| 1210 const char* err = NULL; | |
| 1211 | |
| 1212 // Walk along each array of parameter types, including a virtual | |
| 1213 // NULL end marker at the end of each. | |
| 1214 for (int src_idx = src_beg, dst_idx = dst_beg; | |
| 1215 (src_idx <= src_end && dst_idx <= dst_end); | |
| 1216 src_idx++, dst_idx++) { | |
| 1217 oop src_type = (src_idx == src_end) ? oop(NULL) : src_ptypes->obj_at(src_idx); | |
| 1218 oop dst_type = (dst_idx == dst_end) ? oop(NULL) : dst_ptypes->obj_at(dst_idx); | |
| 1219 bool fix_null_src_type = false; | |
| 1220 | |
| 1221 // Perform requested edits. | |
| 1222 if (ins_idx == src_idx) { | |
| 1223 // note that the inserted guy is never affected by a change or deletion | |
| 1224 ins_idx = -1; | |
| 1225 src_type = insert_type; | |
| 1226 fix_null_src_type = true; | |
| 1227 --src_idx; // back up to process src type on next loop | |
| 1228 src_idx = src_end; | |
| 1229 } else { | |
| 1230 // note that the changed guy can be immediately deleted | |
| 1231 if (chg_idx == src_idx) { | |
| 1232 chg_idx = -1; | |
| 1233 assert(src_idx < src_end, "oob"); | |
| 1234 src_type = change_type; | |
| 1235 fix_null_src_type = true; | |
| 1236 } | |
| 1237 if (del_idx == src_idx) { | |
| 1238 del_idx = -1; | |
| 1239 assert(src_idx < src_end, "oob"); | |
| 1240 --dst_idx; | |
| 1241 continue; // rerun loop after skipping this position | |
| 1242 } | |
| 1243 } | |
| 1244 | |
| 1245 if (src_type == NULL && fix_null_src_type) | |
| 1246 // explicit null in this case matches any dest reference | |
| 1247 src_type = (java_lang_Class::is_primitive(dst_type) ? object_java_mirror() : dst_type); | |
| 1248 | |
| 1249 // Compare the two argument types. | |
| 1250 if (src_type != dst_type) { | |
| 1251 if (src_type == NULL) return "not enough arguments"; | |
| 1252 if (dst_type == NULL) return "too many arguments"; | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1253 err = check_argument_type_change(src_type, dst_type, dst_idx, raw); |
| 710 | 1254 if (err != NULL) return err; |
| 1255 } | |
| 1256 } | |
| 1257 | |
| 1258 // Now compare return types also. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1259 oop src_rtype = java_lang_invoke_MethodType::rtype(src_mtype); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1260 oop dst_rtype = java_lang_invoke_MethodType::rtype(dst_mtype); |
| 710 | 1261 if (src_rtype != dst_rtype) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1262 err = check_return_type_change(dst_rtype, src_rtype, raw); // note reversal! |
| 710 | 1263 if (err != NULL) return err; |
| 1264 } | |
| 1265 | |
| 1266 assert(err == NULL, ""); | |
| 1267 return NULL; // all is well | |
| 1268 } | |
| 1269 | |
| 1270 | |
| 1271 const char* MethodHandles::check_argument_type_change(BasicType src_type, | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1272 klassOop src_klass, |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1273 BasicType dst_type, |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1274 klassOop dst_klass, |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1275 int argnum, |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1276 bool raw) { |
| 710 | 1277 const char* err = NULL; |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1278 bool for_return = (argnum < 0); |
| 710 | 1279 |
| 1280 // just in case: | |
| 1281 if (src_type == T_ARRAY) src_type = T_OBJECT; | |
| 1282 if (dst_type == T_ARRAY) dst_type = T_OBJECT; | |
| 1283 | |
| 1284 // Produce some nice messages if VerifyMethodHandles is turned on: | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1285 if (!same_basic_type_for_arguments(src_type, dst_type, raw, for_return)) { |
| 710 | 1286 if (src_type == T_OBJECT) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1287 if (raw && dst_type == T_INT && is_always_null_type(src_klass)) |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1288 return NULL; // OK to convert a null pointer to a garbage int |
| 710 | 1289 err = ((argnum >= 0) |
| 1290 ? "type mismatch: passing a %s for method argument #%d, which expects primitive %s" | |
| 1291 : "type mismatch: returning a %s, but caller expects primitive %s"); | |
| 1292 } else if (dst_type == T_OBJECT) { | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1293 err = ((argnum >= 0) |
| 710 | 1294 ? "type mismatch: passing a primitive %s for method argument #%d, which expects %s" |
| 1295 : "type mismatch: returning a primitive %s, but caller expects %s"); | |
| 1296 } else { | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1297 err = ((argnum >= 0) |
| 710 | 1298 ? "type mismatch: passing a %s for method argument #%d, which expects %s" |
| 1299 : "type mismatch: returning a %s, but caller expects %s"); | |
| 1300 } | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1301 } else if (src_type == T_OBJECT && dst_type == T_OBJECT && |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1302 class_cast_needed(src_klass, dst_klass)) { |
| 710 | 1303 if (!class_cast_needed(dst_klass, src_klass)) { |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1304 if (raw) |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1305 return NULL; // reverse cast is OK; the MH target is trusted to enforce it |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1306 err = ((argnum >= 0) |
| 710 | 1307 ? "cast required: passing a %s for method argument #%d, which expects %s" |
| 1308 : "cast required: returning a %s, but caller expects %s"); | |
| 1309 } else { | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1310 err = ((argnum >= 0) |
| 710 | 1311 ? "reference mismatch: passing a %s for method argument #%d, which expects %s" |
| 1312 : "reference mismatch: returning a %s, but caller expects %s"); | |
| 1313 } | |
| 1314 } else { | |
| 1315 // passed the obstacle course | |
| 1316 return NULL; | |
| 1317 } | |
| 1318 | |
| 1319 // format, format, format | |
| 1320 const char* src_name = type2name(src_type); | |
| 1321 const char* dst_name = type2name(dst_type); | |
| 1322 if (src_name == NULL) src_name = "unknown type"; | |
| 1323 if (dst_name == NULL) dst_name = "unknown type"; | |
|
2478
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1324 if (src_type == T_OBJECT) |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1325 src_name = (src_klass != NULL) ? Klass::cast(src_klass)->external_name() : "an unresolved class"; |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1326 if (dst_type == T_OBJECT) |
|
328926869b15
6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults
jrose
parents:
2460
diff
changeset
|
1327 dst_name = (dst_klass != NULL) ? Klass::cast(dst_klass)->external_name() : "an unresolved class"; |
| 710 | 1328 |
| 1329 size_t msglen = strlen(err) + strlen(src_name) + strlen(dst_name) + (argnum < 10 ? 1 : 11); | |
| 1330 char* msg = NEW_RESOURCE_ARRAY(char, msglen + 1); | |
| 1331 if (argnum >= 0) { | |
| 1332 assert(strstr(err, "%d") != NULL, ""); | |
| 1333 jio_snprintf(msg, msglen, err, src_name, argnum, dst_name); | |
| 1334 } else { | |
| 1335 assert(strstr(err, "%d") == NULL, ""); | |
| 1336 jio_snprintf(msg, msglen, err, src_name, dst_name); | |
| 1337 } | |
| 1338 return msg; | |
| 1339 } | |
| 1340 | |
| 1341 // Compute the depth within the stack of the given argument, i.e., | |
| 1342 // the combined size of arguments to the right of the given argument. | |
| 1343 // For the last argument (ptypes.length-1) this will be zero. | |
| 1344 // For the first argument (0) this will be the size of all | |
| 1345 // arguments but that one. For the special number -1, this | |
| 1346 // will be the size of all arguments, including the first. | |
| 1347 // If the argument is neither -1 nor a valid argument index, | |
| 1348 // then return a negative number. Otherwise, the result | |
| 1349 // is in the range [0..vmslots] inclusive. | |
| 1350 int MethodHandles::argument_slot(oop method_type, int arg) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1351 objArrayOop ptypes = java_lang_invoke_MethodType::ptypes(method_type); |
| 710 | 1352 int argslot = 0; |
| 1353 int len = ptypes->length(); | |
| 1354 if (arg < -1 || arg >= len) return -99; | |
| 1355 for (int i = len-1; i > arg; i--) { | |
| 1356 BasicType bt = java_lang_Class::as_BasicType(ptypes->obj_at(i)); | |
| 1357 argslot += type2size[bt]; | |
| 1358 } | |
| 1359 assert(argument_slot_to_argnum(method_type, argslot) == arg, "inverse works"); | |
| 1360 return argslot; | |
| 1361 } | |
| 1362 | |
| 1363 // Given a slot number, return the argument number. | |
| 1364 int MethodHandles::argument_slot_to_argnum(oop method_type, int query_argslot) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1365 objArrayOop ptypes = java_lang_invoke_MethodType::ptypes(method_type); |
| 710 | 1366 int argslot = 0; |
| 1367 int len = ptypes->length(); | |
| 1368 for (int i = len-1; i >= 0; i--) { | |
| 1369 if (query_argslot == argslot) return i; | |
| 1370 BasicType bt = java_lang_Class::as_BasicType(ptypes->obj_at(i)); | |
| 1371 argslot += type2size[bt]; | |
| 1372 } | |
| 1373 // return pseudo-arg deepest in stack: | |
| 1374 if (query_argslot == argslot) return -1; | |
| 1375 return -99; // oob slot, or splitting a double-slot arg | |
| 1376 } | |
| 1377 | |
| 1378 methodHandle MethodHandles::dispatch_decoded_method(methodHandle m, | |
| 1379 KlassHandle receiver_limit, | |
| 1380 int decode_flags, | |
| 1381 KlassHandle receiver_klass, | |
| 1382 TRAPS) { | |
| 1383 assert((decode_flags & ~_DMF_DIRECT_MASK) == 0, "must be direct method reference"); | |
| 1384 assert((decode_flags & _dmf_has_receiver) != 0, "must have a receiver or first reference argument"); | |
| 1385 | |
| 1386 if (!m->is_static() && | |
| 1387 (receiver_klass.is_null() || !receiver_klass->is_subtype_of(m->method_holder()))) | |
| 1388 // given type does not match class of method, or receiver is null! | |
| 1389 // caller should have checked this, but let's be extra careful... | |
| 1390 return methodHandle(); | |
| 1391 | |
| 1392 if (receiver_limit.not_null() && | |
| 1393 (receiver_klass.not_null() && !receiver_klass->is_subtype_of(receiver_limit()))) | |
| 1394 // given type is not limited to the receiver type | |
| 1395 // note that a null receiver can match any reference value, for a static method | |
| 1396 return methodHandle(); | |
| 1397 | |
| 1398 if (!(decode_flags & MethodHandles::_dmf_does_dispatch)) { | |
| 1399 // pre-dispatched or static method (null receiver is OK for static) | |
| 1400 return m; | |
| 1401 | |
| 1402 } else if (receiver_klass.is_null()) { | |
| 1403 // null receiver value; cannot dispatch | |
| 1404 return methodHandle(); | |
| 1405 | |
| 1406 } else if (!(decode_flags & MethodHandles::_dmf_from_interface)) { | |
| 1407 // perform virtual dispatch | |
| 1408 int vtable_index = m->vtable_index(); | |
| 1409 guarantee(vtable_index >= 0, "valid vtable index"); | |
| 1410 | |
| 1411 // receiver_klass might be an arrayKlassOop but all vtables start at | |
| 1412 // the same place. The cast is to avoid virtual call and assertion. | |
| 1413 // See also LinkResolver::runtime_resolve_virtual_method. | |
| 1414 instanceKlass* inst = (instanceKlass*)Klass::cast(receiver_klass()); | |
| 1415 DEBUG_ONLY(inst->verify_vtable_index(vtable_index)); | |
| 1416 methodOop m_oop = inst->method_at_vtable(vtable_index); | |
| 1417 return methodHandle(THREAD, m_oop); | |
| 1418 | |
| 1419 } else { | |
| 1420 // perform interface dispatch | |
| 1421 int itable_index = klassItable::compute_itable_index(m()); | |
| 1422 guarantee(itable_index >= 0, "valid itable index"); | |
| 1423 instanceKlass* inst = instanceKlass::cast(receiver_klass()); | |
| 1424 methodOop m_oop = inst->method_at_itable(m->method_holder(), itable_index, THREAD); | |
| 1425 return methodHandle(THREAD, m_oop); | |
| 1426 } | |
| 1427 } | |
| 1428 | |
| 1429 void MethodHandles::verify_DirectMethodHandle(Handle mh, methodHandle m, TRAPS) { | |
| 1430 // Verify type. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1431 Handle mtype(THREAD, java_lang_invoke_MethodHandle::type(mh())); |
| 710 | 1432 verify_method_type(m, mtype, false, KlassHandle(), CHECK); |
| 1433 | |
| 1434 // Verify vmslots. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1435 if (java_lang_invoke_MethodHandle::vmslots(mh()) != m->size_of_parameters()) { |
| 710 | 1436 THROW_MSG(vmSymbols::java_lang_InternalError(), "bad vmslots in DMH"); |
| 1437 } | |
| 1438 } | |
| 1439 | |
| 1440 void MethodHandles::init_DirectMethodHandle(Handle mh, methodHandle m, bool do_dispatch, TRAPS) { | |
| 1441 // Check arguments. | |
| 1442 if (mh.is_null() || m.is_null() || | |
| 1443 (!do_dispatch && m->is_abstract())) { | |
| 1444 THROW(vmSymbols::java_lang_InternalError()); | |
| 1445 } | |
| 1446 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1447 java_lang_invoke_MethodHandle::init_vmslots(mh()); |
| 710 | 1448 |
| 1449 if (VerifyMethodHandles) { | |
| 1450 // The privileged code which invokes this routine should not make | |
| 1451 // a mistake about types, but it's better to verify. | |
| 1452 verify_DirectMethodHandle(mh, m, CHECK); | |
| 1453 } | |
| 1454 | |
| 1455 // Finally, after safety checks are done, link to the target method. | |
| 1456 // We will follow the same path as the latter part of | |
| 1457 // InterpreterRuntime::resolve_invoke(), which first finds the method | |
| 1458 // and then decides how to populate the constant pool cache entry | |
| 1459 // that links the interpreter calls to the method. We need the same | |
| 1460 // bits, and will use the same calling sequence code. | |
| 1461 | |
| 1462 int vmindex = methodOopDesc::garbage_vtable_index; | |
| 1463 oop vmtarget = NULL; | |
| 1464 | |
| 1465 instanceKlass::cast(m->method_holder())->link_class(CHECK); | |
| 1466 | |
| 1467 MethodHandleEntry* me = NULL; | |
| 1468 if (do_dispatch && Klass::cast(m->method_holder())->is_interface()) { | |
| 1469 // We are simulating an invokeinterface instruction. | |
| 1470 // (We might also be simulating an invokevirtual on a miranda method, | |
| 1471 // but it is safe to treat it as an invokeinterface.) | |
| 1472 assert(!m->can_be_statically_bound(), "no final methods on interfaces"); | |
| 1473 vmindex = klassItable::compute_itable_index(m()); | |
| 1474 assert(vmindex >= 0, "(>=0) == do_dispatch"); | |
| 1475 // Set up same bits as ConstantPoolCacheEntry::set_interface_call(). | |
| 1476 vmtarget = m->method_holder(); // the interface | |
| 1477 me = MethodHandles::entry(MethodHandles::_invokeinterface_mh); | |
| 1478 } else if (!do_dispatch || m->can_be_statically_bound()) { | |
| 1479 // We are simulating an invokestatic or invokespecial instruction. | |
| 1480 // Set up the method pointer, just like ConstantPoolCacheEntry::set_method(). | |
| 1481 vmtarget = m(); | |
| 1482 // this does not help dispatch, but it will make it possible to parse this MH: | |
| 1483 vmindex = methodOopDesc::nonvirtual_vtable_index; | |
| 1484 assert(vmindex < 0, "(>=0) == do_dispatch"); | |
| 1485 if (!m->is_static()) { | |
| 1486 me = MethodHandles::entry(MethodHandles::_invokespecial_mh); | |
| 1487 } else { | |
| 1488 me = MethodHandles::entry(MethodHandles::_invokestatic_mh); | |
| 1489 // Part of the semantics of a static call is an initialization barrier. | |
| 1490 // For a DMH, it is done now, when the handle is created. | |
| 1491 Klass* k = Klass::cast(m->method_holder()); | |
| 1492 if (k->should_be_initialized()) { | |
| 1493 k->initialize(CHECK); | |
| 1494 } | |
| 1495 } | |
| 1496 } else { | |
| 1497 // We are simulating an invokevirtual instruction. | |
| 1498 // Set up the vtable index, just like ConstantPoolCacheEntry::set_method(). | |
| 1499 // The key logic is LinkResolver::runtime_resolve_virtual_method. | |
| 1500 vmindex = m->vtable_index(); | |
| 1501 vmtarget = m->method_holder(); | |
| 1502 me = MethodHandles::entry(MethodHandles::_invokevirtual_mh); | |
| 1503 } | |
| 1504 | |
| 1505 if (me == NULL) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 1506 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1507 java_lang_invoke_DirectMethodHandle::set_vmtarget(mh(), vmtarget); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1508 java_lang_invoke_DirectMethodHandle::set_vmindex(mh(), vmindex); |
| 710 | 1509 DEBUG_ONLY(int flags; klassOop rlimit); |
| 1510 assert(MethodHandles::decode_method(mh(), rlimit, flags) == m(), | |
| 1511 "properly stored for later decoding"); | |
| 1512 DEBUG_ONLY(bool actual_do_dispatch = ((flags & _dmf_does_dispatch) != 0)); | |
| 1513 assert(!(actual_do_dispatch && !do_dispatch), | |
| 1514 "do not perform dispatch if !do_dispatch specified"); | |
| 1515 assert(actual_do_dispatch == (vmindex >= 0), "proper later decoding of do_dispatch"); | |
| 1516 assert(decode_MethodHandle_stack_pushes(mh()) == 0, "DMH does not move stack"); | |
| 1517 | |
| 1518 // Done! | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1519 java_lang_invoke_MethodHandle::set_vmentry(mh(), me); |
| 710 | 1520 } |
| 1521 | |
| 1522 void MethodHandles::verify_BoundMethodHandle_with_receiver(Handle mh, | |
| 1523 methodHandle m, | |
| 1524 TRAPS) { | |
| 1525 // Verify type. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1526 oop receiver = java_lang_invoke_BoundMethodHandle::argument(mh()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1527 Handle mtype(THREAD, java_lang_invoke_MethodHandle::type(mh())); |
| 710 | 1528 KlassHandle bound_recv_type; |
| 1529 if (receiver != NULL) bound_recv_type = KlassHandle(THREAD, receiver->klass()); | |
| 1530 verify_method_type(m, mtype, true, bound_recv_type, CHECK); | |
| 1531 | |
| 1532 int receiver_pos = m->size_of_parameters() - 1; | |
| 1533 | |
| 1534 // Verify MH.vmargslot, which should point at the bound receiver. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1535 verify_vmargslot(mh, -1, java_lang_invoke_BoundMethodHandle::vmargslot(mh()), CHECK); |
| 710 | 1536 //verify_vmslots(mh, CHECK); |
| 1537 | |
| 1538 // Verify vmslots. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1539 if (java_lang_invoke_MethodHandle::vmslots(mh()) != receiver_pos) { |
| 710 | 1540 THROW_MSG(vmSymbols::java_lang_InternalError(), "bad vmslots in BMH (receiver)"); |
| 1541 } | |
| 1542 } | |
| 1543 | |
| 1544 // Initialize a BMH with a receiver bound directly to a methodOop. | |
| 1545 void MethodHandles::init_BoundMethodHandle_with_receiver(Handle mh, | |
| 1546 methodHandle original_m, | |
| 1547 KlassHandle receiver_limit, | |
| 1548 int decode_flags, | |
| 1549 TRAPS) { | |
| 1550 // Check arguments. | |
| 1551 if (mh.is_null() || original_m.is_null()) { | |
| 1552 THROW(vmSymbols::java_lang_InternalError()); | |
| 1553 } | |
| 1554 | |
| 1555 KlassHandle receiver_klass; | |
| 1556 { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1557 oop receiver_oop = java_lang_invoke_BoundMethodHandle::argument(mh()); |
| 710 | 1558 if (receiver_oop != NULL) |
| 1559 receiver_klass = KlassHandle(THREAD, receiver_oop->klass()); | |
| 1560 } | |
| 1561 methodHandle m = dispatch_decoded_method(original_m, | |
| 1562 receiver_limit, decode_flags, | |
| 1563 receiver_klass, | |
| 1564 CHECK); | |
| 1565 if (m.is_null()) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 1566 if (m->is_abstract()) { THROW(vmSymbols::java_lang_AbstractMethodError()); } | |
| 1567 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1568 java_lang_invoke_MethodHandle::init_vmslots(mh()); |
| 710 | 1569 |
| 1570 if (VerifyMethodHandles) { | |
| 1571 verify_BoundMethodHandle_with_receiver(mh, m, CHECK); | |
| 1572 } | |
| 1573 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1574 java_lang_invoke_BoundMethodHandle::set_vmtarget(mh(), m()); |
| 710 | 1575 |
| 1576 DEBUG_ONLY(int junk; klassOop junk2); | |
| 1577 assert(MethodHandles::decode_method(mh(), junk2, junk) == m(), "properly stored for later decoding"); | |
| 1578 assert(decode_MethodHandle_stack_pushes(mh()) == 1, "BMH pushes one stack slot"); | |
| 1579 | |
| 1580 // Done! | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1581 java_lang_invoke_MethodHandle::set_vmentry(mh(), MethodHandles::entry(MethodHandles::_bound_ref_direct_mh)); |
| 710 | 1582 } |
| 1583 | |
| 1584 void MethodHandles::verify_BoundMethodHandle(Handle mh, Handle target, int argnum, | |
| 1585 bool direct_to_method, TRAPS) { | |
| 1586 Handle ptype_handle(THREAD, | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1587 java_lang_invoke_MethodType::ptype(java_lang_invoke_MethodHandle::type(target()), argnum)); |
| 710 | 1588 KlassHandle ptype_klass; |
| 1589 BasicType ptype = java_lang_Class::as_BasicType(ptype_handle(), &ptype_klass); | |
| 1590 int slots_pushed = type2size[ptype]; | |
| 1591 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1592 oop argument = java_lang_invoke_BoundMethodHandle::argument(mh()); |
| 710 | 1593 |
| 1594 const char* err = NULL; | |
| 1595 | |
| 1596 switch (ptype) { | |
| 1597 case T_OBJECT: | |
| 1598 if (argument != NULL) | |
| 1599 // we must implicitly convert from the arg type to the outgoing ptype | |
| 1600 err = check_argument_type_change(T_OBJECT, argument->klass(), ptype, ptype_klass(), argnum); | |
| 1601 break; | |
| 1602 | |
| 1603 case T_ARRAY: case T_VOID: | |
| 1604 assert(false, "array, void do not appear here"); | |
| 1605 default: | |
| 1606 if (ptype != T_INT && !is_subword_type(ptype)) { | |
| 1607 err = "unexpected parameter type"; | |
| 1608 break; | |
| 1609 } | |
| 1610 // check subrange of Integer.value, if necessary | |
| 1142 | 1611 if (argument == NULL || argument->klass() != SystemDictionary::Integer_klass()) { |
| 710 | 1612 err = "bound integer argument must be of type java.lang.Integer"; |
| 1613 break; | |
| 1614 } | |
| 1615 if (ptype != T_INT) { | |
| 1616 int value_offset = java_lang_boxing_object::value_offset_in_bytes(T_INT); | |
| 1617 jint value = argument->int_field(value_offset); | |
|
1849
5beba6174298
6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC
twisti
parents:
1748
diff
changeset
|
1618 int vminfo = adapter_unbox_subword_vminfo(ptype); |
| 710 | 1619 jint subword = truncate_subword_from_vminfo(value, vminfo); |
| 1620 if (value != subword) { | |
| 1621 err = "bound subword value does not fit into the subword type"; | |
| 1622 break; | |
| 1623 } | |
| 1624 } | |
| 1625 break; | |
| 1626 case T_FLOAT: | |
| 1627 case T_DOUBLE: | |
| 1628 case T_LONG: | |
| 1629 { | |
| 1630 // we must implicitly convert from the unboxed arg type to the outgoing ptype | |
| 1631 BasicType argbox = java_lang_boxing_object::basic_type(argument); | |
| 1632 if (argbox != ptype) { | |
| 1633 err = check_argument_type_change(T_OBJECT, (argument == NULL | |
| 1142 | 1634 ? SystemDictionary::Object_klass() |
| 710 | 1635 : argument->klass()), |
| 1636 ptype, ptype_klass(), argnum); | |
| 1637 assert(err != NULL, "this must be an error"); | |
| 1638 } | |
| 1639 break; | |
| 1640 } | |
| 1641 } | |
| 1642 | |
| 1643 if (err == NULL) { | |
| 1644 DEBUG_ONLY(int this_pushes = decode_MethodHandle_stack_pushes(mh())); | |
| 1645 if (direct_to_method) { | |
| 1646 assert(this_pushes == slots_pushed, "BMH pushes one or two stack slots"); | |
| 1647 assert(slots_pushed <= MethodHandlePushLimit, ""); | |
| 1648 } else { | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1649 int target_pushes = decode_MethodHandle_stack_pushes(target()); |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1650 assert(this_pushes == slots_pushed + target_pushes, "BMH stack motion must be correct"); |
| 710 | 1651 // do not blow the stack; use a Java-based adapter if this limit is exceeded |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1652 // FIXME |
|
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1653 // if (slots_pushed + target_pushes > MethodHandlePushLimit) |
|
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1654 // err = "too many bound parameters"; |
| 710 | 1655 } |
| 1656 } | |
| 1657 | |
| 1658 if (err == NULL) { | |
| 1659 // Verify the rest of the method type. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1660 err = check_method_type_insertion(java_lang_invoke_MethodHandle::type(mh()), |
| 710 | 1661 argnum, ptype_handle(), |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1662 java_lang_invoke_MethodHandle::type(target())); |
| 710 | 1663 } |
| 1664 | |
| 1665 if (err != NULL) { | |
| 1666 THROW_MSG(vmSymbols::java_lang_InternalError(), err); | |
| 1667 } | |
| 1668 } | |
| 1669 | |
| 1670 void MethodHandles::init_BoundMethodHandle(Handle mh, Handle target, int argnum, TRAPS) { | |
| 1671 // Check arguments. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1672 if (mh.is_null() || target.is_null() || !java_lang_invoke_MethodHandle::is_instance(target())) { |
| 710 | 1673 THROW(vmSymbols::java_lang_InternalError()); |
| 1674 } | |
| 1675 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1676 java_lang_invoke_MethodHandle::init_vmslots(mh()); |
| 710 | 1677 |
| 1678 if (VerifyMethodHandles) { | |
| 1679 int insert_after = argnum - 1; | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1680 verify_vmargslot(mh, insert_after, java_lang_invoke_BoundMethodHandle::vmargslot(mh()), CHECK); |
| 710 | 1681 verify_vmslots(mh, CHECK); |
| 1682 } | |
| 1683 | |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1684 // Get bound type and required slots. |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1685 oop ptype_oop = java_lang_invoke_MethodType::ptype(java_lang_invoke_MethodHandle::type(target()), argnum); |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1686 BasicType ptype = java_lang_Class::as_BasicType(ptype_oop); |
|
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1687 int slots_pushed = type2size[ptype]; |
|
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1688 |
| 710 | 1689 // If (a) the target is a direct non-dispatched method handle, |
| 1690 // or (b) the target is a dispatched direct method handle and we | |
| 1691 // are binding the receiver, cut out the middle-man. | |
| 1692 // Do this by decoding the DMH and using its methodOop directly as vmtarget. | |
| 1693 bool direct_to_method = false; | |
| 1694 if (OptimizeMethodHandles && | |
| 1695 target->klass() == SystemDictionary::DirectMethodHandle_klass() && | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1696 (argnum == 0 || java_lang_invoke_DirectMethodHandle::vmindex(target()) < 0)) { |
| 710 | 1697 int decode_flags = 0; klassOop receiver_limit_oop = NULL; |
| 1698 methodHandle m(THREAD, decode_method(target(), receiver_limit_oop, decode_flags)); | |
| 1699 if (m.is_null()) { THROW_MSG(vmSymbols::java_lang_InternalError(), "DMH failed to decode"); } | |
|
1138
dd57230ba8fe
6893268: additional dynamic language related optimizations in C2
twisti
parents:
1059
diff
changeset
|
1700 DEBUG_ONLY(int m_vmslots = m->size_of_parameters() - slots_pushed); // pos. of 1st arg. |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1701 assert(java_lang_invoke_BoundMethodHandle::vmslots(mh()) == m_vmslots, "type w/ m sig"); |
| 710 | 1702 if (argnum == 0 && (decode_flags & _dmf_has_receiver) != 0) { |
| 1703 KlassHandle receiver_limit(THREAD, receiver_limit_oop); | |
| 1704 init_BoundMethodHandle_with_receiver(mh, m, | |
| 1705 receiver_limit, decode_flags, | |
| 1706 CHECK); | |
| 1707 return; | |
| 1708 } | |
| 1709 | |
| 1710 // Even if it is not a bound receiver, we still might be able | |
| 1711 // to bind another argument and still invoke the methodOop directly. | |
| 1712 if (!(decode_flags & _dmf_does_dispatch)) { | |
| 1713 direct_to_method = true; | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1714 java_lang_invoke_BoundMethodHandle::set_vmtarget(mh(), m()); |
| 710 | 1715 } |
| 1716 } | |
| 1717 if (!direct_to_method) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1718 java_lang_invoke_BoundMethodHandle::set_vmtarget(mh(), target()); |
| 710 | 1719 |
| 1720 if (VerifyMethodHandles) { | |
| 1721 verify_BoundMethodHandle(mh, target, argnum, direct_to_method, CHECK); | |
| 1722 } | |
| 1723 | |
| 1724 // Next question: Is this a ref, int, or long bound value? | |
| 1725 MethodHandleEntry* me = NULL; | |
| 1726 if (ptype == T_OBJECT) { | |
| 1727 if (direct_to_method) me = MethodHandles::entry(_bound_ref_direct_mh); | |
| 1728 else me = MethodHandles::entry(_bound_ref_mh); | |
| 1729 } else if (slots_pushed == 2) { | |
| 1730 if (direct_to_method) me = MethodHandles::entry(_bound_long_direct_mh); | |
| 1731 else me = MethodHandles::entry(_bound_long_mh); | |
| 1732 } else if (slots_pushed == 1) { | |
| 1733 if (direct_to_method) me = MethodHandles::entry(_bound_int_direct_mh); | |
| 1734 else me = MethodHandles::entry(_bound_int_mh); | |
| 1735 } else { | |
| 1736 assert(false, ""); | |
| 1737 } | |
| 1738 | |
| 1739 // Done! | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1740 java_lang_invoke_MethodHandle::set_vmentry(mh(), me); |
| 710 | 1741 } |
| 1742 | |
| 1743 static void throw_InternalError_for_bad_conversion(int conversion, const char* err, TRAPS) { | |
| 1744 char msg[200]; | |
| 1745 jio_snprintf(msg, sizeof(msg), "bad adapter (conversion=0x%08x): %s", conversion, err); | |
| 1746 THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), msg); | |
| 1747 } | |
| 1748 | |
| 1749 void MethodHandles::verify_AdapterMethodHandle(Handle mh, int argnum, TRAPS) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1750 jint conversion = java_lang_invoke_AdapterMethodHandle::conversion(mh()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1751 int argslot = java_lang_invoke_AdapterMethodHandle::vmargslot(mh()); |
| 710 | 1752 |
| 1753 verify_vmargslot(mh, argnum, argslot, CHECK); | |
| 1754 verify_vmslots(mh, CHECK); | |
| 1755 | |
| 1756 jint conv_op = adapter_conversion_op(conversion); | |
| 1757 if (!conv_op_valid(conv_op)) { | |
| 1758 throw_InternalError_for_bad_conversion(conversion, "unknown conversion op", THREAD); | |
| 1759 return; | |
| 1760 } | |
| 1761 EntryKind ek = adapter_entry_kind(conv_op); | |
| 1762 | |
| 1763 int stack_move = adapter_conversion_stack_move(conversion); | |
| 1764 BasicType src = adapter_conversion_src_type(conversion); | |
| 1765 BasicType dest = adapter_conversion_dest_type(conversion); | |
| 1766 int vminfo = adapter_conversion_vminfo(conversion); // should be zero | |
| 1767 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1768 Handle argument(THREAD, java_lang_invoke_AdapterMethodHandle::argument(mh())); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1769 Handle target(THREAD, java_lang_invoke_AdapterMethodHandle::vmtarget(mh())); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1770 Handle src_mtype(THREAD, java_lang_invoke_MethodHandle::type(mh())); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1771 Handle dst_mtype(THREAD, java_lang_invoke_MethodHandle::type(target())); |
| 710 | 1772 |
| 1773 const char* err = NULL; | |
| 1774 | |
| 1775 if (err == NULL) { | |
| 1776 // Check that the correct argument is supplied, but only if it is required. | |
| 1777 switch (ek) { | |
| 1778 case _adapter_check_cast: // target type of cast | |
| 1779 case _adapter_ref_to_prim: // wrapper type from which to unbox | |
| 1780 case _adapter_prim_to_ref: // wrapper type to box into | |
| 1781 case _adapter_collect_args: // array type to collect into | |
| 1782 case _adapter_spread_args: // array type to spread from | |
| 1783 if (!java_lang_Class::is_instance(argument()) | |
| 1784 || java_lang_Class::is_primitive(argument())) | |
| 1785 { err = "adapter requires argument of type java.lang.Class"; break; } | |
| 1786 if (ek == _adapter_collect_args || | |
| 1787 ek == _adapter_spread_args) { | |
| 1788 // Make sure it is a suitable collection type. (Array, for now.) | |
| 1789 Klass* ak = Klass::cast(java_lang_Class::as_klassOop(argument())); | |
| 1790 if (!ak->oop_is_objArray()) { | |
| 1791 { err = "adapter requires argument of type java.lang.Class<Object[]>"; break; } | |
| 1792 } | |
| 1793 } | |
| 1794 break; | |
| 1795 case _adapter_flyby: | |
| 1796 case _adapter_ricochet: | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1797 if (!java_lang_invoke_MethodHandle::is_instance(argument())) |
| 710 | 1798 { err = "MethodHandle adapter argument required"; break; } |
| 1799 break; | |
| 1800 default: | |
| 1801 if (argument.not_null()) | |
| 1802 { err = "adapter has spurious argument"; break; } | |
| 1803 break; | |
| 1804 } | |
| 1805 } | |
| 1806 | |
| 1807 if (err == NULL) { | |
| 1808 // Check that the src/dest types are supplied if needed. | |
| 1809 switch (ek) { | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1810 case _adapter_check_cast: |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1811 if (src != T_OBJECT || dest != T_OBJECT) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1812 err = "adapter requires object src/dest conversion subfields"; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1813 } |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1814 break; |
| 710 | 1815 case _adapter_prim_to_prim: |
| 1816 if (!is_java_primitive(src) || !is_java_primitive(dest) || src == dest) { | |
| 1817 err = "adapter requires primitive src/dest conversion subfields"; break; | |
| 1818 } | |
| 1819 if ( (src == T_FLOAT || src == T_DOUBLE) && !(dest == T_FLOAT || dest == T_DOUBLE) || | |
| 1820 !(src == T_FLOAT || src == T_DOUBLE) && (dest == T_FLOAT || dest == T_DOUBLE)) { | |
| 1821 err = "adapter cannot convert beween floating and fixed-point"; break; | |
| 1822 } | |
| 1823 break; | |
| 1824 case _adapter_ref_to_prim: | |
| 1825 if (src != T_OBJECT || !is_java_primitive(dest) | |
| 1826 || argument() != Klass::cast(SystemDictionary::box_klass(dest))->java_mirror()) { | |
| 1827 err = "adapter requires primitive dest conversion subfield"; break; | |
| 1828 } | |
| 1829 break; | |
| 1830 case _adapter_prim_to_ref: | |
| 1831 if (!is_java_primitive(src) || dest != T_OBJECT | |
| 1832 || argument() != Klass::cast(SystemDictionary::box_klass(src))->java_mirror()) { | |
| 1833 err = "adapter requires primitive src conversion subfield"; break; | |
| 1834 } | |
| 1835 break; | |
| 1836 case _adapter_swap_args: | |
| 1837 case _adapter_rot_args: | |
| 1838 { | |
| 1839 if (!src || src != dest) { | |
| 1840 err = "adapter requires src/dest conversion subfields for swap"; break; | |
| 1841 } | |
| 1842 int swap_size = type2size[src]; | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1843 oop src_mtype = java_lang_invoke_AdapterMethodHandle::type(mh()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1844 oop dest_mtype = java_lang_invoke_AdapterMethodHandle::type(target()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1845 int slot_limit = java_lang_invoke_AdapterMethodHandle::vmslots(target()); |
| 710 | 1846 int src_slot = argslot; |
| 1847 int dest_slot = vminfo; | |
| 1848 bool rotate_up = (src_slot > dest_slot); // upward rotation | |
| 1849 int src_arg = argnum; | |
| 1850 int dest_arg = argument_slot_to_argnum(dest_mtype, dest_slot); | |
| 1851 verify_vmargslot(mh, dest_arg, dest_slot, CHECK); | |
| 1852 if (!(dest_slot >= src_slot + swap_size) && | |
| 1853 !(src_slot >= dest_slot + swap_size)) { | |
| 1854 err = "source, destination slots must be distinct"; | |
| 1855 } else if (ek == _adapter_swap_args && !(src_slot > dest_slot)) { | |
| 1856 err = "source of swap must be deeper in stack"; | |
| 1857 } else if (ek == _adapter_swap_args) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1858 err = check_argument_type_change(java_lang_invoke_MethodType::ptype(src_mtype, dest_arg), |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1859 java_lang_invoke_MethodType::ptype(dest_mtype, src_arg), |
| 710 | 1860 dest_arg); |
| 1861 } else if (ek == _adapter_rot_args) { | |
| 1862 if (rotate_up) { | |
| 1863 assert((src_slot > dest_slot) && (src_arg < dest_arg), ""); | |
| 1864 // rotate up: [dest_slot..src_slot-ss] --> [dest_slot+ss..src_slot] | |
| 1865 // that is: [src_arg+1..dest_arg] --> [src_arg..dest_arg-1] | |
| 1866 for (int i = src_arg+1; i <= dest_arg && err == NULL; i++) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1867 err = check_argument_type_change(java_lang_invoke_MethodType::ptype(src_mtype, i), |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1868 java_lang_invoke_MethodType::ptype(dest_mtype, i-1), |
| 710 | 1869 i); |
| 1870 } | |
| 1871 } else { // rotate down | |
| 1872 assert((src_slot < dest_slot) && (src_arg > dest_arg), ""); | |
| 1873 // rotate down: [src_slot+ss..dest_slot] --> [src_slot..dest_slot-ss] | |
| 1874 // that is: [dest_arg..src_arg-1] --> [dst_arg+1..src_arg] | |
| 1875 for (int i = dest_arg; i <= src_arg-1 && err == NULL; i++) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1876 err = check_argument_type_change(java_lang_invoke_MethodType::ptype(src_mtype, i), |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1877 java_lang_invoke_MethodType::ptype(dest_mtype, i+1), |
| 710 | 1878 i); |
| 1879 } | |
| 1880 } | |
| 1881 } | |
| 1882 if (err == NULL) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1883 err = check_argument_type_change(java_lang_invoke_MethodType::ptype(src_mtype, src_arg), |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1884 java_lang_invoke_MethodType::ptype(dest_mtype, dest_arg), |
| 710 | 1885 src_arg); |
| 1886 } | |
| 1887 break; | |
| 1888 case _adapter_collect_args: | |
| 1889 case _adapter_spread_args: | |
| 1890 { | |
| 1891 BasicType coll_type = (ek == _adapter_collect_args) ? dest : src; | |
| 1892 BasicType elem_type = (ek == _adapter_collect_args) ? src : dest; | |
| 1893 if (coll_type != T_OBJECT || elem_type != T_OBJECT) { | |
| 1894 err = "adapter requires src/dest subfields"; break; | |
| 1895 // later: | |
| 1896 // - consider making coll be a primitive array | |
| 1897 // - consider making coll be a heterogeneous collection | |
| 1898 } | |
| 1899 } | |
| 1900 break; | |
| 1901 default: | |
| 1902 if (src != 0 || dest != 0) { | |
| 1903 err = "adapter has spurious src/dest conversion subfields"; break; | |
| 1904 } | |
| 1905 break; | |
| 1906 } | |
| 1907 } | |
| 1908 | |
| 1909 if (err == NULL) { | |
| 1910 // Check the stack_move subfield. | |
| 1911 // It must always report the net change in stack size, positive or negative. | |
| 1912 int slots_pushed = stack_move / stack_move_unit(); | |
| 1913 switch (ek) { | |
| 1914 case _adapter_prim_to_prim: | |
| 1915 case _adapter_ref_to_prim: | |
| 1916 case _adapter_prim_to_ref: | |
| 1917 if (slots_pushed != type2size[dest] - type2size[src]) { | |
| 1918 err = "wrong stack motion for primitive conversion"; | |
| 1919 } | |
| 1920 break; | |
| 1921 case _adapter_dup_args: | |
| 1922 if (slots_pushed <= 0) { | |
| 1923 err = "adapter requires conversion subfield slots_pushed > 0"; | |
| 1924 } | |
| 1925 break; | |
| 1926 case _adapter_drop_args: | |
| 1927 if (slots_pushed >= 0) { | |
| 1928 err = "adapter requires conversion subfield slots_pushed < 0"; | |
| 1929 } | |
| 1930 break; | |
| 1931 case _adapter_collect_args: | |
| 1932 if (slots_pushed > 1) { | |
| 1933 err = "adapter requires conversion subfield slots_pushed <= 1"; | |
| 1934 } | |
| 1935 break; | |
| 1936 case _adapter_spread_args: | |
| 1937 if (slots_pushed < -1) { | |
| 1938 err = "adapter requires conversion subfield slots_pushed >= -1"; | |
| 1939 } | |
| 1940 break; | |
| 1941 default: | |
| 1942 if (stack_move != 0) { | |
| 1943 err = "adapter has spurious stack_move conversion subfield"; | |
| 1944 } | |
| 1945 break; | |
| 1946 } | |
| 1947 if (err == NULL && stack_move != slots_pushed * stack_move_unit()) { | |
| 1948 err = "stack_move conversion subfield must be multiple of stack_move_unit"; | |
| 1949 } | |
| 1950 } | |
| 1951 | |
| 1952 if (err == NULL) { | |
| 1953 // Make sure this adapter does not push too deeply. | |
| 1954 int slots_pushed = stack_move / stack_move_unit(); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1955 int this_vmslots = java_lang_invoke_MethodHandle::vmslots(mh()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1956 int target_vmslots = java_lang_invoke_MethodHandle::vmslots(target()); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1957 if (slots_pushed != (target_vmslots - this_vmslots)) { |
| 710 | 1958 err = "stack_move inconsistent with previous and current MethodType vmslots"; |
| 1959 } else if (slots_pushed > 0) { | |
| 1960 // verify stack_move against MethodHandlePushLimit | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1961 int target_pushes = decode_MethodHandle_stack_pushes(target()); |
| 710 | 1962 // do not blow the stack; use a Java-based adapter if this limit is exceeded |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1963 if (slots_pushed + target_pushes > MethodHandlePushLimit) { |
| 710 | 1964 err = "adapter pushes too many parameters"; |
| 1965 } | |
| 1966 } | |
| 1967 | |
| 1968 // While we're at it, check that the stack motion decoder works: | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1969 DEBUG_ONLY(int target_pushes = decode_MethodHandle_stack_pushes(target())); |
| 710 | 1970 DEBUG_ONLY(int this_pushes = decode_MethodHandle_stack_pushes(mh())); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1971 assert(this_pushes == slots_pushed + target_pushes, "AMH stack motion must be correct"); |
| 710 | 1972 } |
| 1973 | |
| 1974 if (err == NULL && vminfo != 0) { | |
| 1975 switch (ek) { | |
| 1976 case _adapter_swap_args: | |
| 1977 case _adapter_rot_args: | |
| 1978 break; // OK | |
| 1979 default: | |
| 1980 err = "vminfo subfield is reserved to the JVM"; | |
| 1981 } | |
| 1982 } | |
| 1983 | |
| 1984 // Do additional ad hoc checks. | |
| 1985 if (err == NULL) { | |
| 1986 switch (ek) { | |
| 1987 case _adapter_retype_only: | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1988 err = check_method_type_passthrough(src_mtype(), dst_mtype(), false); |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1989 break; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1990 |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1991 case _adapter_retype_raw: |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
1992 err = check_method_type_passthrough(src_mtype(), dst_mtype(), true); |
| 710 | 1993 break; |
| 1994 | |
| 1995 case _adapter_check_cast: | |
| 1996 { | |
| 1997 // The actual value being checked must be a reference: | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
1998 err = check_argument_type_change(java_lang_invoke_MethodType::ptype(src_mtype(), argnum), |
| 710 | 1999 object_java_mirror(), argnum); |
| 2000 if (err != NULL) break; | |
| 2001 | |
| 2002 // The output of the cast must fit with the destination argument: | |
| 2003 Handle cast_class = argument; | |
| 2004 err = check_method_type_conversion(src_mtype(), | |
| 2005 argnum, cast_class(), | |
| 2006 dst_mtype()); | |
| 2007 } | |
| 2008 break; | |
| 2009 | |
| 2010 // %%% TO DO: continue in remaining cases to verify src/dst_mtype if VerifyMethodHandles | |
| 2011 } | |
| 2012 } | |
| 2013 | |
| 2014 if (err != NULL) { | |
| 2015 throw_InternalError_for_bad_conversion(conversion, err, THREAD); | |
| 2016 return; | |
| 2017 } | |
| 2018 | |
| 2019 } | |
| 2020 | |
| 2021 void MethodHandles::init_AdapterMethodHandle(Handle mh, Handle target, int argnum, TRAPS) { | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2022 oop argument = java_lang_invoke_AdapterMethodHandle::argument(mh()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2023 int argslot = java_lang_invoke_AdapterMethodHandle::vmargslot(mh()); |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2024 jint conversion = java_lang_invoke_AdapterMethodHandle::conversion(mh()); |
| 710 | 2025 jint conv_op = adapter_conversion_op(conversion); |
| 2026 | |
| 2027 // adjust the adapter code to the internal EntryKind enumeration: | |
| 2028 EntryKind ek_orig = adapter_entry_kind(conv_op); | |
| 2029 EntryKind ek_opt = ek_orig; // may be optimized | |
| 2030 | |
| 2031 // Finalize the vmtarget field (Java initialized it to null). | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2032 if (!java_lang_invoke_MethodHandle::is_instance(target())) { |
| 710 | 2033 throw_InternalError_for_bad_conversion(conversion, "bad target", THREAD); |
| 2034 return; | |
| 2035 } | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2036 java_lang_invoke_AdapterMethodHandle::set_vmtarget(mh(), target()); |
| 710 | 2037 |
| 2038 if (VerifyMethodHandles) { | |
| 2039 verify_AdapterMethodHandle(mh, argnum, CHECK); | |
| 2040 } | |
| 2041 | |
| 2042 int stack_move = adapter_conversion_stack_move(conversion); | |
| 2043 BasicType src = adapter_conversion_src_type(conversion); | |
| 2044 BasicType dest = adapter_conversion_dest_type(conversion); | |
| 2045 int vminfo = adapter_conversion_vminfo(conversion); // should be zero | |
| 2046 | |
| 2047 const char* err = NULL; | |
| 2048 | |
| 2049 // Now it's time to finish the case analysis and pick a MethodHandleEntry. | |
| 2050 switch (ek_orig) { | |
| 2051 case _adapter_retype_only: | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2052 case _adapter_retype_raw: |
| 710 | 2053 case _adapter_check_cast: |
| 2054 case _adapter_dup_args: | |
| 2055 case _adapter_drop_args: | |
| 2056 // these work fine via general case code | |
| 2057 break; | |
| 2058 | |
| 2059 case _adapter_prim_to_prim: | |
| 2060 { | |
| 2061 // Non-subword cases are {int,float,long,double} -> {int,float,long,double}. | |
| 2062 // And, the {float,double} -> {int,long} cases must be handled by Java. | |
| 2063 switch (type2size[src] *4+ type2size[dest]) { | |
| 2064 case 1 *4+ 1: | |
| 2065 assert(src == T_INT || is_subword_type(src), "source is not float"); | |
| 2066 // Subword-related cases are int -> {boolean,byte,char,short}. | |
| 2067 ek_opt = _adapter_opt_i2i; | |
|
1849
5beba6174298
6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC
twisti
parents:
1748
diff
changeset
|
2068 vminfo = adapter_prim_to_prim_subword_vminfo(dest); |
| 710 | 2069 break; |
| 2070 case 2 *4+ 1: | |
| 2071 if (src == T_LONG && (dest == T_INT || is_subword_type(dest))) { | |
| 2072 ek_opt = _adapter_opt_l2i; | |
|
1849
5beba6174298
6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC
twisti
parents:
1748
diff
changeset
|
2073 vminfo = adapter_prim_to_prim_subword_vminfo(dest); |
| 710 | 2074 } else if (src == T_DOUBLE && dest == T_FLOAT) { |
| 2075 ek_opt = _adapter_opt_d2f; | |
| 2076 } else { | |
| 2077 assert(false, ""); | |
| 2078 } | |
| 2079 break; | |
| 2080 case 1 *4+ 2: | |
| 2081 if (src == T_INT && dest == T_LONG) { | |
| 2082 ek_opt = _adapter_opt_i2l; | |
| 2083 } else if (src == T_FLOAT && dest == T_DOUBLE) { | |
| 2084 ek_opt = _adapter_opt_f2d; | |
| 2085 } else { | |
| 2086 assert(false, ""); | |
| 2087 } | |
| 2088 break; | |
| 2089 default: | |
| 2090 assert(false, ""); | |
| 2091 break; | |
| 2092 } | |
| 2093 } | |
| 2094 break; | |
| 2095 | |
| 2096 case _adapter_ref_to_prim: | |
| 2097 { | |
| 2098 switch (type2size[dest]) { | |
| 2099 case 1: | |
| 2100 ek_opt = _adapter_opt_unboxi; | |
|
1849
5beba6174298
6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC
twisti
parents:
1748
diff
changeset
|
2101 vminfo = adapter_unbox_subword_vminfo(dest); |
| 710 | 2102 break; |
| 2103 case 2: | |
| 2104 ek_opt = _adapter_opt_unboxl; | |
| 2105 break; | |
| 2106 default: | |
| 2107 assert(false, ""); | |
| 2108 break; | |
| 2109 } | |
| 2110 } | |
| 2111 break; | |
| 2112 | |
| 2113 case _adapter_prim_to_ref: | |
| 2114 goto throw_not_impl; // allocates, hence could block | |
| 2115 | |
| 2116 case _adapter_swap_args: | |
| 2117 case _adapter_rot_args: | |
| 2118 { | |
| 2119 int swap_slots = type2size[src]; | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2120 int slot_limit = java_lang_invoke_AdapterMethodHandle::vmslots(mh()); |
| 710 | 2121 int src_slot = argslot; |
| 2122 int dest_slot = vminfo; | |
| 2123 int rotate = (ek_orig == _adapter_swap_args) ? 0 : (src_slot > dest_slot) ? 1 : -1; | |
| 2124 switch (swap_slots) { | |
| 2125 case 1: | |
| 2126 ek_opt = (!rotate ? _adapter_opt_swap_1 : | |
| 2127 rotate > 0 ? _adapter_opt_rot_1_up : _adapter_opt_rot_1_down); | |
| 2128 break; | |
| 2129 case 2: | |
| 2130 ek_opt = (!rotate ? _adapter_opt_swap_2 : | |
| 2131 rotate > 0 ? _adapter_opt_rot_2_up : _adapter_opt_rot_2_down); | |
| 2132 break; | |
| 2133 default: | |
| 2134 assert(false, ""); | |
| 2135 break; | |
| 2136 } | |
| 2137 } | |
| 2138 break; | |
| 2139 | |
| 2140 case _adapter_collect_args: | |
| 2141 goto throw_not_impl; // allocates, hence could block | |
| 2142 | |
| 2143 case _adapter_spread_args: | |
| 2144 { | |
| 2145 // vminfo will be the required length of the array | |
| 2146 int slots_pushed = stack_move / stack_move_unit(); | |
| 2147 int array_size = slots_pushed + 1; | |
| 2148 assert(array_size >= 0, ""); | |
| 2149 vminfo = array_size; | |
| 2150 switch (array_size) { | |
| 2151 case 0: ek_opt = _adapter_opt_spread_0; break; | |
| 2152 case 1: ek_opt = _adapter_opt_spread_1; break; | |
| 2153 default: ek_opt = _adapter_opt_spread_more; break; | |
| 2154 } | |
| 2155 if ((vminfo & CONV_VMINFO_MASK) != vminfo) | |
| 2156 goto throw_not_impl; // overflow | |
| 2157 } | |
| 2158 break; | |
| 2159 | |
| 2160 case _adapter_flyby: | |
| 2161 case _adapter_ricochet: | |
| 2162 goto throw_not_impl; // runs Java code, hence could block | |
| 2163 | |
| 2164 default: | |
| 2165 // should have failed much earlier; must be a missing case here | |
| 2166 assert(false, "incomplete switch"); | |
| 2167 // and fall through: | |
| 2168 | |
| 2169 throw_not_impl: | |
| 2170 // FIXME: these adapters are NYI | |
| 2171 err = "adapter not yet implemented in the JVM"; | |
| 2172 break; | |
| 2173 } | |
| 2174 | |
| 2175 if (err != NULL) { | |
| 2176 throw_InternalError_for_bad_conversion(conversion, err, THREAD); | |
| 2177 return; | |
| 2178 } | |
| 2179 | |
| 2180 // Rebuild the conversion value; maybe parts of it were changed. | |
| 2181 jint new_conversion = adapter_conversion(conv_op, src, dest, stack_move, vminfo); | |
| 2182 | |
| 2183 // Finalize the conversion field. (Note that it is final to Java code.) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2184 java_lang_invoke_AdapterMethodHandle::set_conversion(mh(), new_conversion); |
| 710 | 2185 |
| 2186 // Done! | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2187 java_lang_invoke_MethodHandle::set_vmentry(mh(), entry(ek_opt)); |
| 710 | 2188 |
| 2189 // There should be enough memory barriers on exit from native methods | |
| 2190 // to ensure that the MH is fully initialized to all threads before | |
| 2191 // Java code can publish it in global data structures. | |
| 2192 } | |
| 2193 | |
| 2194 // | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2195 // Here are the native methods on sun.invoke.MethodHandleImpl. |
| 710 | 2196 // They are the private interface between this JVM and the HotSpot-specific |
| 2197 // Java code that implements JSR 292 method handles. | |
| 2198 // | |
| 2199 // Note: We use a JVM_ENTRY macro to define each of these, for this is the way | |
| 2200 // that intrinsic (non-JNI) native methods are defined in HotSpot. | |
| 2201 // | |
| 2202 | |
| 2203 // direct method handles for invokestatic or invokespecial | |
| 2204 // void init(DirectMethodHandle self, MemberName ref, boolean doDispatch, Class<?> caller); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2205 JVM_ENTRY(void, MHN_init_DMH(JNIEnv *env, jobject igcls, jobject mh_jh, |
| 710 | 2206 jobject target_jh, jboolean do_dispatch, jobject caller_jh)) { |
| 2207 ResourceMark rm; // for error messages | |
| 2208 | |
| 2209 // This is the guy we are initializing: | |
| 2210 if (mh_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 2211 Handle mh(THREAD, JNIHandles::resolve_non_null(mh_jh)); | |
| 2212 | |
| 2213 // Early returns out of this method leave the DMH in an unfinished state. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2214 assert(java_lang_invoke_MethodHandle::vmentry(mh()) == NULL, "must be safely null"); |
| 710 | 2215 |
| 2216 // which method are we really talking about? | |
| 2217 if (target_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 2218 oop target_oop = JNIHandles::resolve_non_null(target_jh); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2219 if (java_lang_invoke_MemberName::is_instance(target_oop) && |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2220 java_lang_invoke_MemberName::vmindex(target_oop) == VM_INDEX_UNINITIALIZED) { |
| 710 | 2221 Handle mname(THREAD, target_oop); |
| 2222 MethodHandles::resolve_MemberName(mname, CHECK); | |
| 2223 target_oop = mname(); // in case of GC | |
| 2224 } | |
| 2225 | |
| 2226 int decode_flags = 0; klassOop receiver_limit = NULL; | |
| 2227 methodHandle m(THREAD, | |
| 2228 MethodHandles::decode_method(target_oop, | |
| 2229 receiver_limit, decode_flags)); | |
| 2230 if (m.is_null()) { THROW_MSG(vmSymbols::java_lang_InternalError(), "no such method"); } | |
| 2231 | |
| 2232 // The trusted Java code that calls this method should already have performed | |
| 2233 // access checks on behalf of the given caller. But, we can verify this. | |
| 2234 if (VerifyMethodHandles && caller_jh != NULL) { | |
| 2235 KlassHandle caller(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(caller_jh))); | |
| 2236 // If this were a bytecode, the first access check would be against | |
| 2237 // the "reference class" mentioned in the CONSTANT_Methodref. | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2238 // We don't know at this point which class that was, and if we |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2239 // check against m.method_holder we might get the wrong answer. |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2240 // So we just make sure to handle this check when the resolution |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2241 // happens, when we call resolve_MemberName. |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2242 // |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2243 // (A public class can inherit public members from private supers, |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2244 // and it would be wrong to check access against the private super |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2245 // if the original symbolic reference was against the public class.) |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2246 // |
| 710 | 2247 // If there were a bytecode, the next step would be to lookup the method |
| 2248 // in the reference class, then then check the method's access bits. | |
| 2249 // Emulate LinkResolver::check_method_accessability. | |
| 2250 klassOop resolved_klass = m->method_holder(); | |
| 2251 if (!Reflection::verify_field_access(caller->as_klassOop(), | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2252 resolved_klass, resolved_klass, |
| 710 | 2253 m->access_flags(), |
| 2254 true)) { | |
| 2255 // %%% following cutout belongs in Reflection::verify_field_access? | |
| 2256 bool same_pm = Reflection::is_same_package_member(caller->as_klassOop(), | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2257 resolved_klass, THREAD); |
| 710 | 2258 if (!same_pm) { |
| 2259 THROW_MSG(vmSymbols::java_lang_InternalError(), m->name_and_sig_as_C_string()); | |
| 2260 } | |
| 2261 } | |
| 2262 } | |
| 2263 | |
| 2264 MethodHandles::init_DirectMethodHandle(mh, m, (do_dispatch != JNI_FALSE), CHECK); | |
| 2265 } | |
| 2266 JVM_END | |
| 2267 | |
| 2268 // bound method handles | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2269 JVM_ENTRY(void, MHN_init_BMH(JNIEnv *env, jobject igcls, jobject mh_jh, |
| 710 | 2270 jobject target_jh, int argnum)) { |
| 2271 ResourceMark rm; // for error messages | |
| 2272 | |
| 2273 // This is the guy we are initializing: | |
| 2274 if (mh_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 2275 Handle mh(THREAD, JNIHandles::resolve_non_null(mh_jh)); | |
| 2276 | |
| 2277 // Early returns out of this method leave the BMH in an unfinished state. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2278 assert(java_lang_invoke_MethodHandle::vmentry(mh()) == NULL, "must be safely null"); |
| 710 | 2279 |
| 2280 if (target_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 2281 Handle target(THREAD, JNIHandles::resolve_non_null(target_jh)); | |
| 2282 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2283 if (!java_lang_invoke_MethodHandle::is_instance(target())) { |
| 710 | 2284 // Target object is a reflective method. (%%% Do we need this alternate path?) |
| 2285 Untested("init_BMH of non-MH"); | |
| 2286 if (argnum != 0) { THROW(vmSymbols::java_lang_InternalError()); } | |
| 2287 int decode_flags = 0; klassOop receiver_limit_oop = NULL; | |
| 2288 methodHandle m(THREAD, | |
| 2289 MethodHandles::decode_method(target(), | |
| 2290 receiver_limit_oop, | |
| 2291 decode_flags)); | |
| 2292 KlassHandle receiver_limit(THREAD, receiver_limit_oop); | |
| 2293 MethodHandles::init_BoundMethodHandle_with_receiver(mh, m, | |
| 2294 receiver_limit, | |
| 2295 decode_flags, | |
| 2296 CHECK); | |
| 2297 return; | |
| 2298 } | |
| 2299 | |
| 2300 // Build a BMH on top of a DMH or another BMH: | |
| 2301 MethodHandles::init_BoundMethodHandle(mh, target, argnum, CHECK); | |
| 2302 } | |
| 2303 JVM_END | |
| 2304 | |
| 2305 // adapter method handles | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2306 JVM_ENTRY(void, MHN_init_AMH(JNIEnv *env, jobject igcls, jobject mh_jh, |
| 710 | 2307 jobject target_jh, int argnum)) { |
| 2308 // This is the guy we are initializing: | |
| 2309 if (mh_jh == NULL || target_jh == NULL) { | |
| 2310 THROW(vmSymbols::java_lang_InternalError()); | |
| 2311 } | |
| 2312 Handle mh(THREAD, JNIHandles::resolve_non_null(mh_jh)); | |
| 2313 Handle target(THREAD, JNIHandles::resolve_non_null(target_jh)); | |
| 2314 | |
| 2315 // Early returns out of this method leave the AMH in an unfinished state. | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2316 assert(java_lang_invoke_MethodHandle::vmentry(mh()) == NULL, "must be safely null"); |
| 710 | 2317 |
| 2318 MethodHandles::init_AdapterMethodHandle(mh, target, argnum, CHECK); | |
| 2319 } | |
| 2320 JVM_END | |
| 2321 | |
| 2322 // method type forms | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2323 JVM_ENTRY(void, MHN_init_MT(JNIEnv *env, jobject igcls, jobject erased_jh)) { |
| 710 | 2324 if (erased_jh == NULL) return; |
| 2325 if (TraceMethodHandles) { | |
| 2326 tty->print("creating MethodType form "); | |
| 2327 if (WizardMode || Verbose) { // Warning: this calls Java code on the MH! | |
| 2328 // call Object.toString() | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2329 Symbol* name = vmSymbols::toString_name(); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2330 Symbol* sig = vmSymbols::void_string_signature(); |
| 710 | 2331 JavaCallArguments args(Handle(THREAD, JNIHandles::resolve_non_null(erased_jh))); |
| 2332 JavaValue result(T_OBJECT); | |
| 1142 | 2333 JavaCalls::call_virtual(&result, SystemDictionary::Object_klass(), name, sig, |
| 710 | 2334 &args, CHECK); |
| 2335 Handle str(THREAD, (oop)result.get_jobject()); | |
| 2336 java_lang_String::print(str, tty); | |
| 2337 } | |
| 2338 tty->cr(); | |
| 2339 } | |
| 2340 } | |
| 2341 JVM_END | |
| 2342 | |
| 2343 // debugging and reflection | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2344 JVM_ENTRY(jobject, MHN_getTarget(JNIEnv *env, jobject igcls, jobject mh_jh, jint format)) { |
| 710 | 2345 Handle mh(THREAD, JNIHandles::resolve(mh_jh)); |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2346 if (!java_lang_invoke_MethodHandle::is_instance(mh())) { |
| 710 | 2347 THROW_NULL(vmSymbols::java_lang_IllegalArgumentException()); |
| 2348 } | |
| 2349 oop target = MethodHandles::encode_target(mh, format, CHECK_NULL); | |
| 2350 return JNIHandles::make_local(THREAD, target); | |
| 2351 } | |
| 2352 JVM_END | |
| 2353 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2354 JVM_ENTRY(jint, MHN_getConstant(JNIEnv *env, jobject igcls, jint which)) { |
| 710 | 2355 switch (which) { |
| 2356 case MethodHandles::GC_JVM_PUSH_LIMIT: | |
| 2357 guarantee(MethodHandlePushLimit >= 2 && MethodHandlePushLimit <= 0xFF, | |
| 2358 "MethodHandlePushLimit parameter must be in valid range"); | |
| 2359 return MethodHandlePushLimit; | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2360 case MethodHandles::GC_JVM_STACK_MOVE_UNIT: |
| 710 | 2361 // return number of words per slot, signed according to stack direction |
| 2362 return MethodHandles::stack_move_unit(); | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2363 case MethodHandles::GC_CONV_OP_IMPLEMENTED_MASK: |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2364 return MethodHandles::adapter_conversion_ops_supported_mask(); |
| 710 | 2365 } |
| 2366 return 0; | |
| 2367 } | |
| 2368 JVM_END | |
| 2369 | |
| 2370 #ifndef PRODUCT | |
| 2371 #define EACH_NAMED_CON(template) \ | |
| 2372 template(MethodHandles,GC_JVM_PUSH_LIMIT) \ | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2373 template(MethodHandles,GC_JVM_STACK_MOVE_UNIT) \ |
| 710 | 2374 template(MethodHandles,ETF_HANDLE_OR_METHOD_NAME) \ |
| 2375 template(MethodHandles,ETF_DIRECT_HANDLE) \ | |
| 2376 template(MethodHandles,ETF_METHOD_NAME) \ | |
| 2377 template(MethodHandles,ETF_REFLECT_METHOD) \ | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2378 template(java_lang_invoke_MemberName,MN_IS_METHOD) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2379 template(java_lang_invoke_MemberName,MN_IS_CONSTRUCTOR) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2380 template(java_lang_invoke_MemberName,MN_IS_FIELD) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2381 template(java_lang_invoke_MemberName,MN_IS_TYPE) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2382 template(java_lang_invoke_MemberName,MN_SEARCH_SUPERCLASSES) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2383 template(java_lang_invoke_MemberName,MN_SEARCH_INTERFACES) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2384 template(java_lang_invoke_MemberName,VM_INDEX_UNINITIALIZED) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2385 template(java_lang_invoke_AdapterMethodHandle,OP_RETYPE_ONLY) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2386 template(java_lang_invoke_AdapterMethodHandle,OP_RETYPE_RAW) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2387 template(java_lang_invoke_AdapterMethodHandle,OP_CHECK_CAST) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2388 template(java_lang_invoke_AdapterMethodHandle,OP_PRIM_TO_PRIM) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2389 template(java_lang_invoke_AdapterMethodHandle,OP_REF_TO_PRIM) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2390 template(java_lang_invoke_AdapterMethodHandle,OP_PRIM_TO_REF) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2391 template(java_lang_invoke_AdapterMethodHandle,OP_SWAP_ARGS) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2392 template(java_lang_invoke_AdapterMethodHandle,OP_ROT_ARGS) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2393 template(java_lang_invoke_AdapterMethodHandle,OP_DUP_ARGS) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2394 template(java_lang_invoke_AdapterMethodHandle,OP_DROP_ARGS) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2395 template(java_lang_invoke_AdapterMethodHandle,OP_COLLECT_ARGS) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2396 template(java_lang_invoke_AdapterMethodHandle,OP_SPREAD_ARGS) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2397 template(java_lang_invoke_AdapterMethodHandle,OP_FLYBY) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2398 template(java_lang_invoke_AdapterMethodHandle,OP_RICOCHET) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2399 template(java_lang_invoke_AdapterMethodHandle,CONV_OP_LIMIT) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2400 template(java_lang_invoke_AdapterMethodHandle,CONV_OP_MASK) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2401 template(java_lang_invoke_AdapterMethodHandle,CONV_VMINFO_MASK) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2402 template(java_lang_invoke_AdapterMethodHandle,CONV_VMINFO_SHIFT) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2403 template(java_lang_invoke_AdapterMethodHandle,CONV_OP_SHIFT) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2404 template(java_lang_invoke_AdapterMethodHandle,CONV_DEST_TYPE_SHIFT) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2405 template(java_lang_invoke_AdapterMethodHandle,CONV_SRC_TYPE_SHIFT) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2406 template(java_lang_invoke_AdapterMethodHandle,CONV_STACK_MOVE_SHIFT) \ |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2407 template(java_lang_invoke_AdapterMethodHandle,CONV_STACK_MOVE_MASK) \ |
| 710 | 2408 /*end*/ |
| 2409 | |
| 2410 #define ONE_PLUS(scope,value) 1+ | |
| 2411 static const int con_value_count = EACH_NAMED_CON(ONE_PLUS) 0; | |
| 2412 #define VALUE_COMMA(scope,value) scope::value, | |
| 2413 static const int con_values[con_value_count+1] = { EACH_NAMED_CON(VALUE_COMMA) 0 }; | |
| 2414 #define STRING_NULL(scope,value) #value "\0" | |
| 2415 static const char con_names[] = { EACH_NAMED_CON(STRING_NULL) }; | |
| 2416 | |
| 2417 #undef ONE_PLUS | |
| 2418 #undef VALUE_COMMA | |
| 2419 #undef STRING_NULL | |
| 2420 #undef EACH_NAMED_CON | |
| 2421 #endif | |
| 2422 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2423 JVM_ENTRY(jint, MHN_getNamedCon(JNIEnv *env, jobject igcls, jint which, jobjectArray box_jh)) { |
| 710 | 2424 #ifndef PRODUCT |
| 2425 if (which >= 0 && which < con_value_count) { | |
| 2426 int con = con_values[which]; | |
| 2427 objArrayOop box = (objArrayOop) JNIHandles::resolve(box_jh); | |
| 2428 if (box != NULL && box->klass() == Universe::objectArrayKlassObj() && box->length() > 0) { | |
| 2429 const char* str = &con_names[0]; | |
| 2430 for (int i = 0; i < which; i++) | |
| 2431 str += strlen(str) + 1; // skip name and null | |
| 2432 oop name = java_lang_String::create_oop_from_str(str, CHECK_0); | |
| 2433 box->obj_at_put(0, name); | |
| 2434 } | |
| 2435 return con; | |
| 2436 } | |
| 2437 #endif | |
| 2438 return 0; | |
| 2439 } | |
| 2440 JVM_END | |
| 2441 | |
| 2442 // void init(MemberName self, AccessibleObject ref) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2443 JVM_ENTRY(void, MHN_init_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jobject target_jh)) { |
| 710 | 2444 if (mname_jh == NULL || target_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } |
| 2445 Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); | |
| 2446 oop target_oop = JNIHandles::resolve_non_null(target_jh); | |
| 2447 MethodHandles::init_MemberName(mname(), target_oop); | |
| 2448 } | |
| 2449 JVM_END | |
| 2450 | |
| 2451 // void expand(MemberName self) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2452 JVM_ENTRY(void, MHN_expand_Mem(JNIEnv *env, jobject igcls, jobject mname_jh)) { |
| 710 | 2453 if (mname_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } |
| 2454 Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); | |
| 2455 MethodHandles::expand_MemberName(mname, 0, CHECK); | |
| 2456 } | |
| 2457 JVM_END | |
| 2458 | |
| 2459 // void resolve(MemberName self, Class<?> caller) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2460 JVM_ENTRY(void, MHN_resolve_Mem(JNIEnv *env, jobject igcls, jobject mname_jh, jclass caller_jh)) { |
| 710 | 2461 if (mname_jh == NULL) { THROW(vmSymbols::java_lang_InternalError()); } |
| 2462 Handle mname(THREAD, JNIHandles::resolve_non_null(mname_jh)); | |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2463 |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2464 // The trusted Java code that calls this method should already have performed |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2465 // access checks on behalf of the given caller. But, we can verify this. |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2466 if (VerifyMethodHandles && caller_jh != NULL) { |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2467 klassOop reference_klass = java_lang_Class::as_klassOop(java_lang_invoke_MemberName::clazz(mname())); |
|
1507
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2468 if (reference_klass != NULL) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2469 // Emulate LinkResolver::check_klass_accessability. |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2470 klassOop caller = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(caller_jh)); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2471 if (!Reflection::verify_class_access(caller, |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2472 reference_klass, |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2473 true)) { |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2474 THROW_MSG(vmSymbols::java_lang_InternalError(), Klass::cast(reference_klass)->external_name()); |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2475 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2476 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2477 } |
|
cd5dbf694d45
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
1299
diff
changeset
|
2478 |
| 710 | 2479 MethodHandles::resolve_MemberName(mname, CHECK); |
| 2480 } | |
| 2481 JVM_END | |
| 2482 | |
| 2483 // static native int getMembers(Class<?> defc, String matchName, String matchSig, | |
| 2484 // int matchFlags, Class<?> caller, int skip, MemberName[] results); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2485 JVM_ENTRY(jint, MHN_getMembers(JNIEnv *env, jobject igcls, |
| 710 | 2486 jclass clazz_jh, jstring name_jh, jstring sig_jh, |
| 2487 int mflags, jclass caller_jh, jint skip, jobjectArray results_jh)) { | |
| 2488 if (clazz_jh == NULL || results_jh == NULL) return -1; | |
| 2489 klassOop k_oop = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(clazz_jh)); | |
| 2490 | |
| 2491 objArrayOop results = (objArrayOop) JNIHandles::resolve(results_jh); | |
| 2492 if (results == NULL || !results->is_objArray()) return -1; | |
| 2493 | |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2494 TempNewSymbol name = NULL; |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2495 TempNewSymbol sig = NULL; |
| 710 | 2496 if (name_jh != NULL) { |
| 2497 name = java_lang_String::as_symbol_or_null(JNIHandles::resolve_non_null(name_jh)); | |
| 2498 if (name == NULL) return 0; // a match is not possible | |
| 2499 } | |
| 2500 if (sig_jh != NULL) { | |
| 2501 sig = java_lang_String::as_symbol_or_null(JNIHandles::resolve_non_null(sig_jh)); | |
| 2502 if (sig == NULL) return 0; // a match is not possible | |
| 2503 } | |
| 2504 | |
| 2505 klassOop caller = NULL; | |
| 2506 if (caller_jh != NULL) { | |
| 2507 oop caller_oop = JNIHandles::resolve_non_null(caller_jh); | |
| 2508 if (!java_lang_Class::is_instance(caller_oop)) return -1; | |
| 2509 caller = java_lang_Class::as_klassOop(caller_oop); | |
| 2510 } | |
| 2511 | |
| 2512 if (name != NULL && sig != NULL && results != NULL) { | |
| 2513 // try a direct resolve | |
| 2514 // %%% TO DO | |
| 2515 } | |
| 2516 | |
| 2517 int res = MethodHandles::find_MemberNames(k_oop, name, sig, mflags, | |
| 2518 caller, skip, results); | |
| 2519 // TO DO: expand at least some of the MemberNames, to avoid massive callbacks | |
| 2520 return res; | |
| 2521 } | |
| 2522 JVM_END | |
| 2523 | |
|
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2524 |
| 710 | 2525 /// JVM_RegisterMethodHandleMethods |
| 2526 | |
| 2527 #define LANG "Ljava/lang/" | |
| 2460 | 2528 #define JLINV "Ljava/lang/invoke/" |
| 710 | 2529 |
| 2530 #define OBJ LANG"Object;" | |
| 2531 #define CLS LANG"Class;" | |
| 2532 #define STRG LANG"String;" | |
| 2460 | 2533 #define MT JLINV"MethodType;" |
| 2534 #define MH JLINV"MethodHandle;" | |
| 2535 #define MEM JLINV"MemberName;" | |
| 2536 #define AMH JLINV"AdapterMethodHandle;" | |
| 2537 #define BMH JLINV"BoundMethodHandle;" | |
| 2538 #define DMH JLINV"DirectMethodHandle;" | |
| 710 | 2539 |
| 2540 #define CC (char*) /*cast a literal from (const char*)*/ | |
| 2541 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f) | |
| 2542 | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2543 // These are the native methods on sun.invoke.MethodHandleNatives. |
| 710 | 2544 static JNINativeMethod methods[] = { |
| 2545 // void init(MemberName self, AccessibleObject ref) | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2546 {CC"init", CC"("AMH""MH"I)V", FN_PTR(MHN_init_AMH)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2547 {CC"init", CC"("BMH""OBJ"I)V", FN_PTR(MHN_init_BMH)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2548 {CC"init", CC"("DMH""OBJ"Z"CLS")V", FN_PTR(MHN_init_DMH)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2549 {CC"init", CC"("MT")V", FN_PTR(MHN_init_MT)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2550 {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2551 {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2552 {CC"resolve", CC"("MEM""CLS")V", FN_PTR(MHN_resolve_Mem)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2553 {CC"getTarget", CC"("MH"I)"OBJ, FN_PTR(MHN_getTarget)}, |
|
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2554 {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)}, |
| 710 | 2555 // static native int getNamedCon(int which, Object[] name) |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2556 {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)}, |
| 710 | 2557 // static native int getMembers(Class<?> defc, String matchName, String matchSig, |
| 2558 // int matchFlags, Class<?> caller, int skip, MemberName[] results); | |
|
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2559 {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)} |
| 710 | 2560 }; |
| 2561 | |
| 2562 // This one function is exported, used by NativeLookup. | |
| 2563 | |
| 2564 JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class)) { | |
| 2565 assert(MethodHandles::spot_check_entry_names(), "entry enum is OK"); | |
| 2566 | |
|
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
2567 if (!EnableInvokeDynamic) { |
|
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2357
diff
changeset
|
2568 warning("JSR 292 is disabled in this JVM. Use -XX:+UnlockDiagnosticVMOptions -XX:+EnableInvokeDynamic to enable."); |
| 710 | 2569 return; // bind nothing |
| 2570 } | |
| 2571 | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2572 bool enable_MH = true; |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2573 |
| 2460 | 2574 { |
| 710 | 2575 ThreadToNativeFromVM ttnfv(thread); |
| 2576 | |
| 2577 int status = env->RegisterNatives(MHN_class, methods, sizeof(methods)/sizeof(JNINativeMethod)); | |
| 2578 if (env->ExceptionOccurred()) { | |
| 2460 | 2579 MethodHandles::set_enabled(false); |
| 2580 warning("JSR 292 method handle code is mismatched to this JVM. Disabling support."); | |
| 2581 enable_MH = false; | |
| 710 | 2582 env->ExceptionClear(); |
| 2583 } | |
| 2584 } | |
|
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2585 |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2586 if (enable_MH) { |
|
2356
72dee110246f
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
2177
diff
changeset
|
2587 KlassHandle MHN_klass = SystemDictionaryHandles::MethodHandleNatives_klass(); |
| 2460 | 2588 if (MHN_klass.not_null()) { |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2589 TempNewSymbol raiseException_name = SymbolTable::new_symbol("raiseException", CHECK); |
|
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2590 TempNewSymbol raiseException_sig = SymbolTable::new_symbol("(ILjava/lang/Object;Ljava/lang/Object;)V", CHECK); |
| 2460 | 2591 methodOop raiseException_method = instanceKlass::cast(MHN_klass->as_klassOop()) |
|
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
2116
diff
changeset
|
2592 ->find_method(raiseException_name, raiseException_sig); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2593 if (raiseException_method != NULL && raiseException_method->is_static()) { |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2594 MethodHandles::set_raise_exception_method(raiseException_method); |
| 2460 | 2595 } else { |
| 2596 warning("JSR 292 method handle code is mismatched to this JVM. Disabling support."); | |
| 2597 enable_MH = false; | |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2598 } |
| 2460 | 2599 } else { |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
2600 enable_MH = false; |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2601 } |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2602 } |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2603 |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2604 if (enable_MH) { |
|
2116
d810e9a3fc33
7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
twisti
parents:
2088
diff
changeset
|
2605 MethodHandles::generate_adapters(); |
|
1039
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2606 MethodHandles::set_enabled(true); |
|
987e948ebbc8
6815692: method handle code needs some cleanup (post-6655638)
jrose
parents:
726
diff
changeset
|
2607 } |
| 710 | 2608 } |
| 2609 JVM_END |