author | never |
Tue, 17 May 2011 19:11:51 -0700 | |
changeset 9946 | b3d5b50e2289 |
parent 9943 | a9aea2b8010f |
child 9971 | d496ecd7b9de |
child 9963 | 4a783069663c |
permissions | -rw-r--r-- |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1 |
/* |
7888
1be03febacc2
7010913: JSR 292 ciMethodHandle does not handle MethodHandleCompiler exceptions properly
twisti
parents:
7426
diff
changeset
|
2 |
* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
4 |
* |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
8 |
* |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
13 |
* accompanied this code). |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
14 |
* |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
18 |
* |
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
diff
changeset
|
21 |
* questions. |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
22 |
* |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
23 |
*/ |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
24 |
|
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "interpreter/rewriter.hpp" |
|
27 |
#include "memory/oopFactory.hpp" |
|
28 |
#include "prims/methodHandleWalk.hpp" |
|
29 |
||
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
30 |
/* |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
31 |
* JSR 292 reference implementation: method handle structure analysis |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
32 |
*/ |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
33 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
34 |
#ifdef PRODUCT |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
35 |
#define print_method_handle(mh) {} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
36 |
#else //PRODUCT |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
37 |
extern "C" void print_method_handle(oop mh); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
38 |
#endif //PRODUCT |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
39 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
40 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
41 |
// MethodHandleChain |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
42 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
43 |
void MethodHandleChain::set_method_handle(Handle mh, TRAPS) { |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
44 |
if (!java_lang_invoke_MethodHandle::is_instance(mh())) lose("bad method handle", CHECK); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
45 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
46 |
// set current method handle and unpack partially |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
47 |
_method_handle = mh; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
48 |
_is_last = false; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
49 |
_is_bound = false; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
50 |
_arg_slot = -1; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
51 |
_arg_type = T_VOID; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
52 |
_conversion = -1; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
53 |
_last_invoke = Bytecodes::_nop; //arbitrary non-garbage |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
54 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
55 |
if (java_lang_invoke_DirectMethodHandle::is_instance(mh())) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
56 |
set_last_method(mh(), THREAD); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
57 |
return; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
58 |
} |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
59 |
if (java_lang_invoke_AdapterMethodHandle::is_instance(mh())) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
60 |
_conversion = AdapterMethodHandle_conversion(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
61 |
assert(_conversion != -1, "bad conv value"); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
62 |
assert(java_lang_invoke_BoundMethodHandle::is_instance(mh()), "also BMH"); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
63 |
} |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
64 |
if (java_lang_invoke_BoundMethodHandle::is_instance(mh())) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
65 |
if (!is_adapter()) // keep AMH and BMH separate in this model |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
66 |
_is_bound = true; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
67 |
_arg_slot = BoundMethodHandle_vmargslot(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
68 |
oop target = MethodHandle_vmtarget_oop(); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
69 |
if (!is_bound() || java_lang_invoke_MethodHandle::is_instance(target)) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
70 |
_arg_type = compute_bound_arg_type(target, NULL, _arg_slot, CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
71 |
} else if (target != NULL && target->is_method()) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
72 |
methodOop m = (methodOop) target; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
73 |
_arg_type = compute_bound_arg_type(NULL, m, _arg_slot, CHECK); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
74 |
set_last_method(mh(), CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
75 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
76 |
_is_bound = false; // lose! |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
77 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
78 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
79 |
if (is_bound() && _arg_type == T_VOID) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
80 |
lose("bad vmargslot", CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
81 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
82 |
if (!is_bound() && !is_adapter()) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
83 |
lose("unrecognized MH type", CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
84 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
85 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
86 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
87 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
88 |
void MethodHandleChain::set_last_method(oop target, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
89 |
_is_last = true; |
9323
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9116
diff
changeset
|
90 |
KlassHandle receiver_limit; int flags = 0; |
20cc2230dc8a
7018355: JSR 292: VM crash in DefNewGeneration::copy_to_survivor_space
twisti
parents:
9116
diff
changeset
|
91 |
_last_method = MethodHandles::decode_method(target, receiver_limit, flags); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
92 |
if ((flags & MethodHandles::_dmf_has_receiver) == 0) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
93 |
_last_invoke = Bytecodes::_invokestatic; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
94 |
else if ((flags & MethodHandles::_dmf_does_dispatch) == 0) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
95 |
_last_invoke = Bytecodes::_invokespecial; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
96 |
else if ((flags & MethodHandles::_dmf_from_interface) != 0) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
97 |
_last_invoke = Bytecodes::_invokeinterface; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
98 |
else |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
99 |
_last_invoke = Bytecodes::_invokevirtual; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
100 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
101 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
102 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
103 |
BasicType MethodHandleChain::compute_bound_arg_type(oop target, methodOop m, int arg_slot, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
104 |
// There is no direct indication of whether the argument is primitive or not. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
105 |
// It is implied by the _vmentry code, and by the MethodType of the target. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
106 |
BasicType arg_type = T_VOID; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
107 |
if (target != NULL) { |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
108 |
oop mtype = java_lang_invoke_MethodHandle::type(target); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
109 |
int arg_num = MethodHandles::argument_slot_to_argnum(mtype, arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
110 |
if (arg_num >= 0) { |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
111 |
oop ptype = java_lang_invoke_MethodType::ptype(mtype, arg_num); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
112 |
arg_type = java_lang_Class::as_BasicType(ptype); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
113 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
114 |
} else if (m != NULL) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
115 |
// figure out the argument type from the slot |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
116 |
// FIXME: make this explicit in the MH |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
117 |
int cur_slot = m->size_of_parameters(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
118 |
if (arg_slot >= cur_slot) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
119 |
return T_VOID; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
120 |
if (!m->is_static()) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
121 |
cur_slot -= type2size[T_OBJECT]; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
122 |
if (cur_slot == arg_slot) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
123 |
return T_OBJECT; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
124 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7888
diff
changeset
|
125 |
ResourceMark rm(THREAD); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
126 |
for (SignatureStream ss(m->signature()); !ss.is_done(); ss.next()) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
127 |
BasicType bt = ss.type(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
128 |
cur_slot -= type2size[bt]; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
129 |
if (cur_slot <= arg_slot) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
130 |
if (cur_slot == arg_slot) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
131 |
arg_type = bt; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
132 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
133 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
134 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
135 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
136 |
if (arg_type == T_ARRAY) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
137 |
arg_type = T_OBJECT; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
138 |
return arg_type; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
139 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
140 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
141 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
142 |
void MethodHandleChain::lose(const char* msg, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
143 |
_lose_message = msg; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
144 |
if (!THREAD->is_Java_thread() || ((JavaThread*)THREAD)->thread_state() != _thread_in_vm) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
145 |
// throw a preallocated exception |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
146 |
THROW_OOP(Universe::virtual_machine_error_instance()); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
147 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
148 |
THROW_MSG(vmSymbols::java_lang_InternalError(), msg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
149 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
150 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
151 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
152 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
153 |
// MethodHandleWalker |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
154 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
155 |
Bytecodes::Code MethodHandleWalker::conversion_code(BasicType src, BasicType dest) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
156 |
if (is_subword_type(src)) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
157 |
src = T_INT; // all subword src types act like int |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
158 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
159 |
if (src == dest) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
160 |
return Bytecodes::_nop; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
161 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
162 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
163 |
#define SRC_DEST(s,d) (((int)(s) << 4) + (int)(d)) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
164 |
switch (SRC_DEST(src, dest)) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
165 |
case SRC_DEST(T_INT, T_LONG): return Bytecodes::_i2l; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
166 |
case SRC_DEST(T_INT, T_FLOAT): return Bytecodes::_i2f; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
167 |
case SRC_DEST(T_INT, T_DOUBLE): return Bytecodes::_i2d; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
168 |
case SRC_DEST(T_INT, T_BYTE): return Bytecodes::_i2b; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
169 |
case SRC_DEST(T_INT, T_CHAR): return Bytecodes::_i2c; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
170 |
case SRC_DEST(T_INT, T_SHORT): return Bytecodes::_i2s; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
171 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
172 |
case SRC_DEST(T_LONG, T_INT): return Bytecodes::_l2i; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
173 |
case SRC_DEST(T_LONG, T_FLOAT): return Bytecodes::_l2f; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
174 |
case SRC_DEST(T_LONG, T_DOUBLE): return Bytecodes::_l2d; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
175 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
176 |
case SRC_DEST(T_FLOAT, T_INT): return Bytecodes::_f2i; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
177 |
case SRC_DEST(T_FLOAT, T_LONG): return Bytecodes::_f2l; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
178 |
case SRC_DEST(T_FLOAT, T_DOUBLE): return Bytecodes::_f2d; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
179 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
180 |
case SRC_DEST(T_DOUBLE, T_INT): return Bytecodes::_d2i; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
181 |
case SRC_DEST(T_DOUBLE, T_LONG): return Bytecodes::_d2l; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
182 |
case SRC_DEST(T_DOUBLE, T_FLOAT): return Bytecodes::_d2f; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
183 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
184 |
#undef SRC_DEST |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
185 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
186 |
// cannot do it in one step, or at all |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
187 |
return Bytecodes::_illegal; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
188 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
189 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
190 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
191 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
192 |
// MethodHandleWalker::walk |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
193 |
// |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
194 |
MethodHandleWalker::ArgToken |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
195 |
MethodHandleWalker::walk(TRAPS) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
196 |
ArgToken empty = ArgToken(); // Empty return value. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
197 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
198 |
walk_incoming_state(CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
199 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
200 |
for (;;) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
201 |
set_method_handle(chain().method_handle_oop()); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
202 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
203 |
assert(_outgoing_argc == argument_count_slow(), "empty slots under control"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
204 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
205 |
if (chain().is_adapter()) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
206 |
int conv_op = chain().adapter_conversion_op(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
207 |
int arg_slot = chain().adapter_arg_slot(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
208 |
SlotState* arg_state = slot_state(arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
209 |
if (arg_state == NULL |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
210 |
&& conv_op > java_lang_invoke_AdapterMethodHandle::OP_RETYPE_RAW) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
211 |
lose("bad argument index", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
212 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
213 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
214 |
bool retain_original_args = false; // used by fold/collect logic |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
215 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
216 |
// perform the adapter action |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
217 |
switch (conv_op) { |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
218 |
case java_lang_invoke_AdapterMethodHandle::OP_RETYPE_ONLY: |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
219 |
// No changes to arguments; pass the bits through. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
220 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
221 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
222 |
case java_lang_invoke_AdapterMethodHandle::OP_RETYPE_RAW: { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
223 |
// To keep the verifier happy, emit bitwise ("raw") conversions as needed. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
224 |
// See MethodHandles::same_basic_type_for_arguments for allowed conversions. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
225 |
Handle incoming_mtype(THREAD, chain().method_type_oop()); |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
226 |
Handle outgoing_mtype; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
227 |
{ |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
228 |
oop outgoing_mh_oop = chain().vmtarget_oop(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
229 |
if (!java_lang_invoke_MethodHandle::is_instance(outgoing_mh_oop)) |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
230 |
lose("outgoing target not a MethodHandle", CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
231 |
outgoing_mtype = Handle(THREAD, java_lang_invoke_MethodHandle::type(outgoing_mh_oop)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
232 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
233 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
234 |
int nptypes = java_lang_invoke_MethodType::ptype_count(outgoing_mtype()); |
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
235 |
if (nptypes != java_lang_invoke_MethodType::ptype_count(incoming_mtype())) |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
236 |
lose("incoming and outgoing parameter count do not agree", CHECK_(empty)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
237 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
238 |
// Argument types. |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
239 |
for (int i = 0, slot = _outgoing.length() - 1; slot >= 0; slot--) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
240 |
SlotState* arg_state = slot_state(slot); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
241 |
if (arg_state->_type == T_VOID) continue; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
242 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
243 |
klassOop src_klass = NULL; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
244 |
klassOop dst_klass = NULL; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
245 |
BasicType src = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::ptype(incoming_mtype(), i), &src_klass); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
246 |
BasicType dst = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::ptype(outgoing_mtype(), i), &dst_klass); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
247 |
retype_raw_argument_type(src, dst, slot, CHECK_(empty)); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
248 |
i++; // We need to skip void slots at the top of the loop. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
249 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
250 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
251 |
// Return type. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
252 |
{ |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
253 |
BasicType src = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::rtype(incoming_mtype())); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
254 |
BasicType dst = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::rtype(outgoing_mtype())); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
255 |
retype_raw_return_type(src, dst, CHECK_(empty)); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
256 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
257 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
258 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
259 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
260 |
case java_lang_invoke_AdapterMethodHandle::OP_CHECK_CAST: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
261 |
// checkcast the Nth outgoing argument in place |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
262 |
klassOop dest_klass = NULL; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
263 |
BasicType dest = java_lang_Class::as_BasicType(chain().adapter_arg_oop(), &dest_klass); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
264 |
assert(dest == T_OBJECT, ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
265 |
assert(dest == arg_state->_type, ""); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
266 |
ArgToken arg = arg_state->_arg; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
267 |
ArgToken new_arg = make_conversion(T_OBJECT, dest_klass, Bytecodes::_checkcast, arg, CHECK_(empty)); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
268 |
assert(!arg.has_index() || arg.index() == new_arg.index(), "should be the same index"); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
269 |
debug_only(dest_klass = (klassOop)badOop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
270 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
271 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
272 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
273 |
case java_lang_invoke_AdapterMethodHandle::OP_PRIM_TO_PRIM: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
274 |
// i2l, etc., on the Nth outgoing argument in place |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
275 |
BasicType src = chain().adapter_conversion_src_type(), |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
276 |
dest = chain().adapter_conversion_dest_type(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
277 |
Bytecodes::Code bc = conversion_code(src, dest); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
278 |
ArgToken arg = arg_state->_arg; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
279 |
if (bc == Bytecodes::_nop) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
280 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
281 |
} else if (bc != Bytecodes::_illegal) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
282 |
arg = make_conversion(dest, NULL, bc, arg, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
283 |
} else if (is_subword_type(dest)) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
284 |
bc = conversion_code(src, T_INT); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
285 |
if (bc != Bytecodes::_illegal) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
286 |
arg = make_conversion(dest, NULL, bc, arg, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
287 |
bc = conversion_code(T_INT, dest); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
288 |
arg = make_conversion(dest, NULL, bc, arg, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
289 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
290 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
291 |
if (bc == Bytecodes::_illegal) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
292 |
lose("bad primitive conversion", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
293 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
294 |
change_argument(src, arg_slot, dest, arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
295 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
296 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
297 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
298 |
case java_lang_invoke_AdapterMethodHandle::OP_REF_TO_PRIM: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
299 |
// checkcast to wrapper type & call intValue, etc. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
300 |
BasicType dest = chain().adapter_conversion_dest_type(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
301 |
ArgToken arg = arg_state->_arg; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
302 |
arg = make_conversion(T_OBJECT, SystemDictionary::box_klass(dest), |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
303 |
Bytecodes::_checkcast, arg, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
304 |
vmIntrinsics::ID unboxer = vmIntrinsics::for_unboxing(dest); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
305 |
if (unboxer == vmIntrinsics::_none) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
306 |
lose("no unboxing method", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
307 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
308 |
ArgToken arglist[2]; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
309 |
arglist[0] = arg; // outgoing 'this' |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
310 |
arglist[1] = ArgToken(); // sentinel |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
311 |
arg = make_invoke(NULL, unboxer, Bytecodes::_invokevirtual, false, 1, &arglist[0], CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
312 |
change_argument(T_OBJECT, arg_slot, dest, arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
313 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
314 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
315 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
316 |
case java_lang_invoke_AdapterMethodHandle::OP_PRIM_TO_REF: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
317 |
// call wrapper type.valueOf |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
318 |
BasicType src = chain().adapter_conversion_src_type(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
319 |
ArgToken arg = arg_state->_arg; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
320 |
vmIntrinsics::ID boxer = vmIntrinsics::for_boxing(src); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
321 |
if (boxer == vmIntrinsics::_none) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
322 |
lose("no boxing method", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
323 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
324 |
ArgToken arglist[2]; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
325 |
arglist[0] = arg; // outgoing value |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
326 |
arglist[1] = ArgToken(); // sentinel |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
327 |
arg = make_invoke(NULL, boxer, Bytecodes::_invokestatic, false, 1, &arglist[0], CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
328 |
change_argument(src, arg_slot, T_OBJECT, arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
329 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
330 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
331 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
332 |
case java_lang_invoke_AdapterMethodHandle::OP_SWAP_ARGS: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
333 |
int dest_arg_slot = chain().adapter_conversion_vminfo(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
334 |
if (!slot_has_argument(dest_arg_slot)) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
335 |
lose("bad swap index", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
336 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
337 |
// a simple swap between two arguments |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
338 |
SlotState* dest_arg_state = slot_state(dest_arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
339 |
SlotState temp = (*dest_arg_state); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
340 |
(*dest_arg_state) = (*arg_state); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
341 |
(*arg_state) = temp; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
342 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
343 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
344 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
345 |
case java_lang_invoke_AdapterMethodHandle::OP_ROT_ARGS: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
346 |
int dest_arg_slot = chain().adapter_conversion_vminfo(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
347 |
if (!slot_has_argument(dest_arg_slot) || arg_slot == dest_arg_slot) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
348 |
lose("bad rotate index", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
349 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
350 |
SlotState* dest_arg_state = slot_state(dest_arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
351 |
// Rotate the source argument (plus following N slots) into the |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
352 |
// position occupied by the dest argument (plus following N slots). |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
353 |
int rotate_count = type2size[dest_arg_state->_type]; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
354 |
// (no other rotate counts are currently supported) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
355 |
if (arg_slot < dest_arg_slot) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
356 |
for (int i = 0; i < rotate_count; i++) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
357 |
SlotState temp = _outgoing.at(arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
358 |
_outgoing.remove_at(arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
359 |
_outgoing.insert_before(dest_arg_slot + rotate_count - 1, temp); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
360 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
361 |
} else { // arg_slot > dest_arg_slot |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
362 |
for (int i = 0; i < rotate_count; i++) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
363 |
SlotState temp = _outgoing.at(arg_slot + rotate_count - 1); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
364 |
_outgoing.remove_at(arg_slot + rotate_count - 1); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
365 |
_outgoing.insert_before(dest_arg_slot, temp); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
366 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
367 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
368 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
369 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
370 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
371 |
case java_lang_invoke_AdapterMethodHandle::OP_DUP_ARGS: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
372 |
int dup_slots = chain().adapter_conversion_stack_pushes(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
373 |
if (dup_slots <= 0) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
374 |
lose("bad dup count", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
375 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
376 |
for (int i = 0; i < dup_slots; i++) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
377 |
SlotState* dup = slot_state(arg_slot + 2*i); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
378 |
if (dup == NULL) break; // safety net |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
379 |
if (dup->_type != T_VOID) _outgoing_argc += 1; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
380 |
_outgoing.insert_before(i, (*dup)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
381 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
382 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
383 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
384 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
385 |
case java_lang_invoke_AdapterMethodHandle::OP_DROP_ARGS: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
386 |
int drop_slots = -chain().adapter_conversion_stack_pushes(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
387 |
if (drop_slots <= 0) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
388 |
lose("bad drop count", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
389 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
390 |
for (int i = 0; i < drop_slots; i++) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
391 |
SlotState* drop = slot_state(arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
392 |
if (drop == NULL) break; // safety net |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
393 |
if (drop->_type != T_VOID) _outgoing_argc -= 1; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
394 |
_outgoing.remove_at(arg_slot); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
395 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
396 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
397 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
398 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
399 |
case java_lang_invoke_AdapterMethodHandle::OP_FOLD_ARGS: |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
400 |
retain_original_args = true; // and fall through: |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
401 |
case java_lang_invoke_AdapterMethodHandle::OP_COLLECT_ARGS: { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
402 |
// call argument MH recursively |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
403 |
//{static int x; if (!x++) print_method_handle(chain().method_handle_oop()); --x;} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
404 |
Handle recursive_mh(THREAD, chain().adapter_arg_oop()); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
405 |
if (!java_lang_invoke_MethodHandle::is_instance(recursive_mh())) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
406 |
lose("recursive target not a MethodHandle", CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
407 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
408 |
Handle recursive_mtype(THREAD, java_lang_invoke_MethodHandle::type(recursive_mh())); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
409 |
int argc = java_lang_invoke_MethodType::ptype_count(recursive_mtype()); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
410 |
int coll_slots = java_lang_invoke_MethodHandle::vmslots(recursive_mh()); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
411 |
BasicType rtype = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::rtype(recursive_mtype())); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
412 |
ArgToken* arglist = NEW_RESOURCE_ARRAY(ArgToken, 1 + argc + 1); // 1+: mh, +1: sentinel |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
413 |
arglist[0] = make_oop_constant(recursive_mh(), CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
414 |
if (arg_slot < 0 || coll_slots < 0 || arg_slot + coll_slots > _outgoing.length()) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
415 |
lose("bad fold/collect arg slot", CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
416 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
417 |
for (int i = 0, slot = arg_slot + coll_slots - 1; slot >= arg_slot; slot--) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
418 |
SlotState* arg_state = slot_state(slot); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
419 |
BasicType arg_type = arg_state->_type; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
420 |
if (arg_type == T_VOID) continue; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
421 |
ArgToken arg = _outgoing.at(slot)._arg; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
422 |
if (i >= argc) { lose("bad fold/collect arg", CHECK_(empty)); } |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
423 |
arglist[1+i] = arg; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
424 |
if (!retain_original_args) |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
425 |
change_argument(arg_type, slot, T_VOID, ArgToken(tt_void)); |
9943
a9aea2b8010f
7045515: ARM assembly code for JSR 292 ricochet frames
bdelsart
parents:
9638
diff
changeset
|
426 |
i++; |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
427 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
428 |
arglist[1+argc] = ArgToken(); // sentinel |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
429 |
oop invoker = java_lang_invoke_MethodTypeForm::vmlayout( |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
430 |
java_lang_invoke_MethodType::form(recursive_mtype()) ); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
431 |
if (invoker == NULL || !invoker->is_method()) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
432 |
lose("bad vmlayout slot", CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
433 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
434 |
// FIXME: consider inlining the invokee at the bytecode level |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
435 |
ArgToken ret = make_invoke(methodOop(invoker), vmIntrinsics::_none, |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
436 |
Bytecodes::_invokevirtual, false, 1+argc, &arglist[0], CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
437 |
DEBUG_ONLY(invoker = NULL); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
438 |
if (rtype == T_OBJECT) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
439 |
klassOop rklass = java_lang_Class::as_klassOop( java_lang_invoke_MethodType::rtype(recursive_mtype()) ); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
440 |
if (rklass != SystemDictionary::Object_klass() && |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
441 |
!Klass::cast(rklass)->is_interface()) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
442 |
// preserve type safety |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
443 |
ret = make_conversion(T_OBJECT, rklass, Bytecodes::_checkcast, ret, CHECK_(empty)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
444 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
445 |
} |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
446 |
if (rtype != T_VOID) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
447 |
int ret_slot = arg_slot + (retain_original_args ? coll_slots : 0); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
448 |
change_argument(T_VOID, ret_slot, rtype, ret); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
449 |
} |
9630
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
450 |
break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
451 |
} |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
452 |
|
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
453 |
case java_lang_invoke_AdapterMethodHandle::OP_SPREAD_ARGS: { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
454 |
klassOop array_klass_oop = NULL; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
455 |
BasicType array_type = java_lang_Class::as_BasicType(chain().adapter_arg_oop(), |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
456 |
&array_klass_oop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
457 |
assert(array_type == T_OBJECT, ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
458 |
assert(Klass::cast(array_klass_oop)->oop_is_array(), ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
459 |
arrayKlassHandle array_klass(THREAD, array_klass_oop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
460 |
debug_only(array_klass_oop = (klassOop)badOop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
461 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
462 |
klassOop element_klass_oop = NULL; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
463 |
BasicType element_type = java_lang_Class::as_BasicType(array_klass->component_mirror(), |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
464 |
&element_klass_oop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
465 |
KlassHandle element_klass(THREAD, element_klass_oop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
466 |
debug_only(element_klass_oop = (klassOop)badOop); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
467 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
468 |
// Fetch the argument, which we will cast to the required array type. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
469 |
assert(arg_state->_type == T_OBJECT, ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
470 |
ArgToken array_arg = arg_state->_arg; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
471 |
array_arg = make_conversion(T_OBJECT, array_klass(), Bytecodes::_checkcast, array_arg, CHECK_(empty)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
472 |
change_argument(T_OBJECT, arg_slot, T_VOID, ArgToken(tt_void)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
473 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
474 |
// Check the required length. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
475 |
int spread_slots = 1 + chain().adapter_conversion_stack_pushes(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
476 |
int spread_length = spread_slots; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
477 |
if (type2size[element_type] == 2) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
478 |
if (spread_slots % 2 != 0) spread_slots = -1; // force error |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
479 |
spread_length = spread_slots / 2; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
480 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
481 |
if (spread_slots < 0) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
482 |
lose("bad spread length", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
483 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
484 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
485 |
jvalue length_jvalue; length_jvalue.i = spread_length; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
486 |
ArgToken length_arg = make_prim_constant(T_INT, &length_jvalue, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
487 |
// Call a built-in method known to the JVM to validate the length. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
488 |
ArgToken arglist[3]; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
489 |
arglist[0] = array_arg; // value to check |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
490 |
arglist[1] = length_arg; // length to check |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
491 |
arglist[2] = ArgToken(); // sentinel |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
492 |
make_invoke(NULL, vmIntrinsics::_checkSpreadArgument, |
9943
a9aea2b8010f
7045515: ARM assembly code for JSR 292 ricochet frames
bdelsart
parents:
9638
diff
changeset
|
493 |
Bytecodes::_invokestatic, false, 2, &arglist[0], CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
494 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
495 |
// Spread out the array elements. |
9630
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
496 |
Bytecodes::Code aload_op = Bytecodes::_nop; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
497 |
switch (element_type) { |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
498 |
case T_INT: aload_op = Bytecodes::_iaload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
499 |
case T_LONG: aload_op = Bytecodes::_laload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
500 |
case T_FLOAT: aload_op = Bytecodes::_faload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
501 |
case T_DOUBLE: aload_op = Bytecodes::_daload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
502 |
case T_OBJECT: aload_op = Bytecodes::_aaload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
503 |
case T_BOOLEAN: // fall through: |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
504 |
case T_BYTE: aload_op = Bytecodes::_baload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
505 |
case T_CHAR: aload_op = Bytecodes::_caload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
506 |
case T_SHORT: aload_op = Bytecodes::_saload; break; |
d6419e4395e3
6939861: JVM should handle more conversion operations
never
parents:
9323
diff
changeset
|
507 |
default: lose("primitive array NYI", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
508 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
509 |
int ap = arg_slot; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
510 |
for (int i = 0; i < spread_length; i++) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
511 |
jvalue offset_jvalue; offset_jvalue.i = i; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
512 |
ArgToken offset_arg = make_prim_constant(T_INT, &offset_jvalue, CHECK_(empty)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
513 |
ArgToken element_arg = make_fetch(element_type, element_klass(), aload_op, array_arg, offset_arg, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
514 |
change_argument(T_VOID, ap, element_type, element_arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
515 |
ap += type2size[element_type]; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
516 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
517 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
518 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
519 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
520 |
default: |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
521 |
lose("bad adapter conversion", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
522 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
523 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
524 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
525 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
526 |
if (chain().is_bound()) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
527 |
// push a new argument |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
528 |
BasicType arg_type = chain().bound_arg_type(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
529 |
jint arg_slot = chain().bound_arg_slot(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
530 |
oop arg_oop = chain().bound_arg_oop(); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
531 |
ArgToken arg; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
532 |
if (arg_type == T_OBJECT) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
533 |
arg = make_oop_constant(arg_oop, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
534 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
535 |
jvalue arg_value; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
536 |
BasicType bt = java_lang_boxing_object::get_value(arg_oop, &arg_value); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
537 |
if (bt == arg_type) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
538 |
arg = make_prim_constant(arg_type, &arg_value, CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
539 |
} else { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
540 |
lose("bad bound value", CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
541 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
542 |
} |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
543 |
DEBUG_ONLY(arg_oop = badOop); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
544 |
change_argument(T_VOID, arg_slot, arg_type, arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
545 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
546 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
547 |
// this test must come after the body of the loop |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
548 |
if (!chain().is_last()) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
549 |
chain().next(CHECK_(empty)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
550 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
551 |
break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
552 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
553 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
554 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
555 |
// finish the sequence with a tail-call to the ultimate target |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
556 |
// parameters are passed in logical order (recv 1st), not slot order |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
557 |
ArgToken* arglist = NEW_RESOURCE_ARRAY(ArgToken, _outgoing.length() + 1); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
558 |
int ap = 0; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
559 |
for (int i = _outgoing.length() - 1; i >= 0; i--) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
560 |
SlotState* arg_state = slot_state(i); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
561 |
if (arg_state->_type == T_VOID) continue; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
562 |
arglist[ap++] = _outgoing.at(i)._arg; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
563 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
564 |
assert(ap == _outgoing_argc, ""); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
565 |
arglist[ap] = ArgToken(); // add a sentinel, for the sake of asserts |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
566 |
return make_invoke(chain().last_method_oop(), |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
567 |
vmIntrinsics::_none, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
568 |
chain().last_invoke_code(), true, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
569 |
ap, arglist, THREAD); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
570 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
571 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
572 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
573 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
574 |
// MethodHandleWalker::walk_incoming_state |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
575 |
// |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
576 |
void MethodHandleWalker::walk_incoming_state(TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
577 |
Handle mtype(THREAD, chain().method_type_oop()); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
578 |
int nptypes = java_lang_invoke_MethodType::ptype_count(mtype()); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
579 |
_outgoing_argc = nptypes; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
580 |
int argp = nptypes - 1; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
581 |
if (argp >= 0) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
582 |
_outgoing.at_grow(argp, make_state(T_VOID, ArgToken(tt_void))); // presize |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
583 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
584 |
for (int i = 0; i < nptypes; i++) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
585 |
klassOop arg_type_klass = NULL; |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
586 |
BasicType arg_type = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::ptype(mtype(), i), &arg_type_klass); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
587 |
int index = new_local_index(arg_type); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
588 |
ArgToken arg = make_parameter(arg_type, arg_type_klass, index, CHECK); |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
589 |
DEBUG_ONLY(arg_type_klass = (klassOop) NULL); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
590 |
_outgoing.at_put(argp, make_state(arg_type, arg)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
591 |
if (type2size[arg_type] == 2) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
592 |
// add the extra slot, so we can model the JVM stack |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
593 |
_outgoing.insert_before(argp+1, make_state(T_VOID, ArgToken(tt_void))); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
594 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
595 |
--argp; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
596 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
597 |
// call make_parameter at the end of the list for the return type |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
598 |
klassOop ret_type_klass = NULL; |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
599 |
BasicType ret_type = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::rtype(mtype()), &ret_type_klass); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
600 |
ArgToken ret = make_parameter(ret_type, ret_type_klass, -1, CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
601 |
// ignore ret; client can catch it if needed |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
602 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
603 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
604 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
605 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
606 |
// MethodHandleWalker::change_argument |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
607 |
// |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
608 |
// This is messy because some kinds of arguments are paired with |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
609 |
// companion slots containing an empty value. |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
610 |
void MethodHandleWalker::change_argument(BasicType old_type, int slot, BasicType new_type, |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
611 |
const ArgToken& new_arg) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
612 |
int old_size = type2size[old_type]; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
613 |
int new_size = type2size[new_type]; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
614 |
if (old_size == new_size) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
615 |
// simple case first |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
616 |
_outgoing.at_put(slot, make_state(new_type, new_arg)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
617 |
} else if (old_size > new_size) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
618 |
for (int i = old_size - 1; i >= new_size; i--) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
619 |
assert((i != 0) == (_outgoing.at(slot + i)._type == T_VOID), ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
620 |
_outgoing.remove_at(slot + i); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
621 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
622 |
if (new_size > 0) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
623 |
_outgoing.at_put(slot, make_state(new_type, new_arg)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
624 |
else |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
625 |
_outgoing_argc -= 1; // deleted a real argument |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
626 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
627 |
for (int i = old_size; i < new_size; i++) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
628 |
_outgoing.insert_before(slot + i, make_state(T_VOID, ArgToken(tt_void))); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
629 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
630 |
_outgoing.at_put(slot, make_state(new_type, new_arg)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
631 |
if (old_size == 0) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
632 |
_outgoing_argc += 1; // inserted a real argument |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
633 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
634 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
635 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
636 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
637 |
#ifdef ASSERT |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
638 |
int MethodHandleWalker::argument_count_slow() { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
639 |
int args_seen = 0; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
640 |
for (int i = _outgoing.length() - 1; i >= 0; i--) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
641 |
if (_outgoing.at(i)._type != T_VOID) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
642 |
++args_seen; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
643 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
644 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
645 |
return args_seen; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
646 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
647 |
#endif |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
648 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
649 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
650 |
// ----------------------------------------------------------------------------- |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
651 |
// MethodHandleWalker::retype_raw_conversion |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
652 |
// |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
653 |
// Do the raw retype conversions for OP_RETYPE_RAW. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
654 |
void MethodHandleWalker::retype_raw_conversion(BasicType src, BasicType dst, bool for_return, int slot, TRAPS) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
655 |
if (src != dst) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
656 |
if (MethodHandles::same_basic_type_for_returns(src, dst, /*raw*/ true)) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
657 |
if (MethodHandles::is_float_fixed_reinterpretation_cast(src, dst)) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
658 |
if (for_return) Untested("MHW return raw conversion"); // still untested |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
659 |
vmIntrinsics::ID iid = vmIntrinsics::for_raw_conversion(src, dst); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
660 |
if (iid == vmIntrinsics::_none) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
661 |
lose("no raw conversion method", CHECK); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
662 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
663 |
ArgToken arglist[2]; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
664 |
if (!for_return) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
665 |
// argument type conversion |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
666 |
ArgToken arg = _outgoing.at(slot)._arg; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
667 |
assert(arg.token_type() >= tt_symbolic || src == arg.basic_type(), "sanity"); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
668 |
arglist[0] = arg; // outgoing 'this' |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
669 |
arglist[1] = ArgToken(); // sentinel |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
670 |
arg = make_invoke(NULL, iid, Bytecodes::_invokestatic, false, 1, &arglist[0], CHECK); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
671 |
change_argument(src, slot, dst, arg); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
672 |
} else { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
673 |
// return type conversion |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
674 |
klassOop arg_klass = NULL; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
675 |
arglist[0] = make_parameter(src, arg_klass, -1, CHECK); // return value |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
676 |
arglist[1] = ArgToken(); // sentinel |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
677 |
(void) make_invoke(NULL, iid, Bytecodes::_invokestatic, false, 1, &arglist[0], CHECK); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
678 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
679 |
} else { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
680 |
// Nothing to do. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
681 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
682 |
} else if (src == T_OBJECT && is_java_primitive(dst)) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
683 |
// ref-to-prim: discard ref, push zero |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
684 |
lose("requested ref-to-prim conversion not expected", CHECK); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
685 |
} else { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
686 |
lose("requested raw conversion not allowed", CHECK); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
687 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
688 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
689 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
690 |
|
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
691 |
|
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
692 |
// ----------------------------------------------------------------------------- |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
693 |
// MethodHandleCompiler |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
694 |
|
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
695 |
MethodHandleCompiler::MethodHandleCompiler(Handle root, Symbol* name, Symbol* signature, int invoke_count, bool is_invokedynamic, TRAPS) |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
696 |
: MethodHandleWalker(root, is_invokedynamic, THREAD), |
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
697 |
_invoke_count(invoke_count), |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
698 |
_thread(THREAD), |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
699 |
_bytecode(THREAD, 50), |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
700 |
_constants(THREAD, 10), |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
701 |
_cur_stack(0), |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
702 |
_max_stack(0), |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
703 |
_rtype(T_ILLEGAL) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
704 |
{ |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
705 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
706 |
// Element zero is always the null constant. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
707 |
(void) _constants.append(NULL); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
708 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
709 |
// Set name and signature index. |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
710 |
_name_index = cpool_symbol_put(name); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
711 |
_signature_index = cpool_symbol_put(signature); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
712 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
713 |
// Get return type klass. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
714 |
Handle first_mtype(THREAD, chain().method_type_oop()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
715 |
// _rklass is NULL for primitives. |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
716 |
_rtype = java_lang_Class::as_BasicType(java_lang_invoke_MethodType::rtype(first_mtype()), &_rklass); |
4581
e89fbd1bcb3d
6914206: change way of permission checking for generated MethodHandle adapters
twisti
parents:
4571
diff
changeset
|
717 |
if (_rtype == T_ARRAY) _rtype = T_OBJECT; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
718 |
|
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
719 |
ArgumentSizeComputer args(signature); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
720 |
int params = args.size() + 1; // Incoming arguments plus receiver. |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
721 |
_num_params = for_invokedynamic() ? params - 1 : params; // XXX Check if callee is static? |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
722 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
723 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
724 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
725 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
726 |
// MethodHandleCompiler::compile |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
727 |
// |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
728 |
// Compile this MethodHandle into a bytecode adapter and return a |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
729 |
// methodOop. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
730 |
methodHandle MethodHandleCompiler::compile(TRAPS) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
731 |
assert(_thread == THREAD, "must be same thread"); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
732 |
methodHandle nullHandle; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
733 |
(void) walk(CHECK_(nullHandle)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
734 |
return get_method_oop(CHECK_(nullHandle)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
735 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
736 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
737 |
|
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
738 |
void MethodHandleCompiler::emit_bc(Bytecodes::Code op, int index, int args_size) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
739 |
Bytecodes::check(op); // Are we legal? |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
740 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
741 |
switch (op) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
742 |
// b |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
743 |
case Bytecodes::_aconst_null: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
744 |
case Bytecodes::_iconst_m1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
745 |
case Bytecodes::_iconst_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
746 |
case Bytecodes::_iconst_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
747 |
case Bytecodes::_iconst_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
748 |
case Bytecodes::_iconst_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
749 |
case Bytecodes::_iconst_4: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
750 |
case Bytecodes::_iconst_5: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
751 |
case Bytecodes::_lconst_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
752 |
case Bytecodes::_lconst_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
753 |
case Bytecodes::_fconst_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
754 |
case Bytecodes::_fconst_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
755 |
case Bytecodes::_fconst_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
756 |
case Bytecodes::_dconst_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
757 |
case Bytecodes::_dconst_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
758 |
case Bytecodes::_iload_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
759 |
case Bytecodes::_iload_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
760 |
case Bytecodes::_iload_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
761 |
case Bytecodes::_iload_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
762 |
case Bytecodes::_lload_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
763 |
case Bytecodes::_lload_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
764 |
case Bytecodes::_lload_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
765 |
case Bytecodes::_lload_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
766 |
case Bytecodes::_fload_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
767 |
case Bytecodes::_fload_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
768 |
case Bytecodes::_fload_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
769 |
case Bytecodes::_fload_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
770 |
case Bytecodes::_dload_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
771 |
case Bytecodes::_dload_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
772 |
case Bytecodes::_dload_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
773 |
case Bytecodes::_dload_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
774 |
case Bytecodes::_aload_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
775 |
case Bytecodes::_aload_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
776 |
case Bytecodes::_aload_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
777 |
case Bytecodes::_aload_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
778 |
case Bytecodes::_istore_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
779 |
case Bytecodes::_istore_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
780 |
case Bytecodes::_istore_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
781 |
case Bytecodes::_istore_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
782 |
case Bytecodes::_lstore_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
783 |
case Bytecodes::_lstore_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
784 |
case Bytecodes::_lstore_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
785 |
case Bytecodes::_lstore_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
786 |
case Bytecodes::_fstore_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
787 |
case Bytecodes::_fstore_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
788 |
case Bytecodes::_fstore_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
789 |
case Bytecodes::_fstore_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
790 |
case Bytecodes::_dstore_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
791 |
case Bytecodes::_dstore_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
792 |
case Bytecodes::_dstore_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
793 |
case Bytecodes::_dstore_3: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
794 |
case Bytecodes::_astore_0: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
795 |
case Bytecodes::_astore_1: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
796 |
case Bytecodes::_astore_2: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
797 |
case Bytecodes::_astore_3: |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
798 |
case Bytecodes::_iand: |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
799 |
case Bytecodes::_i2l: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
800 |
case Bytecodes::_i2f: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
801 |
case Bytecodes::_i2d: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
802 |
case Bytecodes::_i2b: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
803 |
case Bytecodes::_i2c: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
804 |
case Bytecodes::_i2s: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
805 |
case Bytecodes::_l2i: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
806 |
case Bytecodes::_l2f: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
807 |
case Bytecodes::_l2d: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
808 |
case Bytecodes::_f2i: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
809 |
case Bytecodes::_f2l: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
810 |
case Bytecodes::_f2d: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
811 |
case Bytecodes::_d2i: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
812 |
case Bytecodes::_d2l: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
813 |
case Bytecodes::_d2f: |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
814 |
case Bytecodes::_iaload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
815 |
case Bytecodes::_laload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
816 |
case Bytecodes::_faload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
817 |
case Bytecodes::_daload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
818 |
case Bytecodes::_aaload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
819 |
case Bytecodes::_baload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
820 |
case Bytecodes::_caload: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
821 |
case Bytecodes::_saload: |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
822 |
case Bytecodes::_ireturn: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
823 |
case Bytecodes::_lreturn: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
824 |
case Bytecodes::_freturn: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
825 |
case Bytecodes::_dreturn: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
826 |
case Bytecodes::_areturn: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
827 |
case Bytecodes::_return: |
5688 | 828 |
assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_b, "wrong bytecode format"); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
829 |
_bytecode.push(op); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
830 |
break; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
831 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
832 |
// bi |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
833 |
case Bytecodes::_ldc: |
6064
71e316283a85
6969574: invokedynamic call sites deoptimize instead of executing
jrose
parents:
5702
diff
changeset
|
834 |
assert(Bytecodes::format_bits(op, false) == (Bytecodes::_fmt_b|Bytecodes::_fmt_has_k), "wrong bytecode format"); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
835 |
if (index == (index & 0xff)) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
836 |
_bytecode.push(op); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
837 |
_bytecode.push(index); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
838 |
} else { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
839 |
_bytecode.push(Bytecodes::_ldc_w); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
840 |
_bytecode.push(index >> 8); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
841 |
_bytecode.push(index); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
842 |
} |
6064
71e316283a85
6969574: invokedynamic call sites deoptimize instead of executing
jrose
parents:
5702
diff
changeset
|
843 |
break; |
71e316283a85
6969574: invokedynamic call sites deoptimize instead of executing
jrose
parents:
5702
diff
changeset
|
844 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
845 |
case Bytecodes::_iload: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
846 |
case Bytecodes::_lload: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
847 |
case Bytecodes::_fload: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
848 |
case Bytecodes::_dload: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
849 |
case Bytecodes::_aload: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
850 |
case Bytecodes::_istore: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
851 |
case Bytecodes::_lstore: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
852 |
case Bytecodes::_fstore: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
853 |
case Bytecodes::_dstore: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
854 |
case Bytecodes::_astore: |
5688 | 855 |
assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bi, "wrong bytecode format"); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
856 |
if (index == (index & 0xff)) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
857 |
_bytecode.push(op); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
858 |
_bytecode.push(index); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
859 |
} else { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
860 |
// doesn't fit in a u2 |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
861 |
_bytecode.push(Bytecodes::_wide); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
862 |
_bytecode.push(op); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
863 |
_bytecode.push(index >> 8); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
864 |
_bytecode.push(index); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
865 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
866 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
867 |
|
6064
71e316283a85
6969574: invokedynamic call sites deoptimize instead of executing
jrose
parents:
5702
diff
changeset
|
868 |
// bkk |
71e316283a85
6969574: invokedynamic call sites deoptimize instead of executing
jrose
parents:
5702
diff
changeset
|
869 |
case Bytecodes::_ldc_w: |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
870 |
case Bytecodes::_ldc2_w: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
871 |
case Bytecodes::_checkcast: |
5688 | 872 |
assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bkk, "wrong bytecode format"); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
873 |
assert((unsigned short) index == index, "index does not fit in 16-bit"); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
874 |
_bytecode.push(op); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
875 |
_bytecode.push(index >> 8); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
876 |
_bytecode.push(index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
877 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
878 |
|
5688 | 879 |
// bJJ |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
880 |
case Bytecodes::_invokestatic: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
881 |
case Bytecodes::_invokespecial: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
882 |
case Bytecodes::_invokevirtual: |
5688 | 883 |
assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bJJ, "wrong bytecode format"); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
884 |
assert((unsigned short) index == index, "index does not fit in 16-bit"); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
885 |
_bytecode.push(op); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
886 |
_bytecode.push(index >> 8); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
887 |
_bytecode.push(index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
888 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
889 |
|
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
890 |
case Bytecodes::_invokeinterface: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
891 |
assert(Bytecodes::format_bits(op, false) == Bytecodes::_fmt_bJJ, "wrong bytecode format"); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
892 |
assert((unsigned short) index == index, "index does not fit in 16-bit"); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
893 |
assert(args_size > 0, "valid args_size"); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
894 |
_bytecode.push(op); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
895 |
_bytecode.push(index >> 8); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
896 |
_bytecode.push(index); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
897 |
_bytecode.push(args_size); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
898 |
_bytecode.push(0); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
899 |
break; |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
900 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
901 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
902 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
903 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
904 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
905 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
906 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
907 |
void MethodHandleCompiler::emit_load(BasicType bt, int index) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
908 |
if (index <= 3) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
909 |
switch (bt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
910 |
case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
911 |
case T_INT: emit_bc(Bytecodes::cast(Bytecodes::_iload_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
912 |
case T_LONG: emit_bc(Bytecodes::cast(Bytecodes::_lload_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
913 |
case T_FLOAT: emit_bc(Bytecodes::cast(Bytecodes::_fload_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
914 |
case T_DOUBLE: emit_bc(Bytecodes::cast(Bytecodes::_dload_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
915 |
case T_OBJECT: emit_bc(Bytecodes::cast(Bytecodes::_aload_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
916 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
917 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
918 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
919 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
920 |
else { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
921 |
switch (bt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
922 |
case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
923 |
case T_INT: emit_bc(Bytecodes::_iload, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
924 |
case T_LONG: emit_bc(Bytecodes::_lload, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
925 |
case T_FLOAT: emit_bc(Bytecodes::_fload, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
926 |
case T_DOUBLE: emit_bc(Bytecodes::_dload, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
927 |
case T_OBJECT: emit_bc(Bytecodes::_aload, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
928 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
929 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
930 |
} |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
931 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
932 |
stack_push(bt); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
933 |
} |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
934 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
935 |
void MethodHandleCompiler::emit_store(BasicType bt, int index) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
936 |
if (index <= 3) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
937 |
switch (bt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
938 |
case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
939 |
case T_INT: emit_bc(Bytecodes::cast(Bytecodes::_istore_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
940 |
case T_LONG: emit_bc(Bytecodes::cast(Bytecodes::_lstore_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
941 |
case T_FLOAT: emit_bc(Bytecodes::cast(Bytecodes::_fstore_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
942 |
case T_DOUBLE: emit_bc(Bytecodes::cast(Bytecodes::_dstore_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
943 |
case T_OBJECT: emit_bc(Bytecodes::cast(Bytecodes::_astore_0 + index)); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
944 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
945 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
946 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
947 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
948 |
else { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
949 |
switch (bt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
950 |
case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
951 |
case T_INT: emit_bc(Bytecodes::_istore, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
952 |
case T_LONG: emit_bc(Bytecodes::_lstore, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
953 |
case T_FLOAT: emit_bc(Bytecodes::_fstore, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
954 |
case T_DOUBLE: emit_bc(Bytecodes::_dstore, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
955 |
case T_OBJECT: emit_bc(Bytecodes::_astore, index); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
956 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
957 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
958 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
959 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
960 |
stack_pop(bt); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
961 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
962 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
963 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
964 |
void MethodHandleCompiler::emit_load_constant(ArgToken arg) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
965 |
BasicType bt = arg.basic_type(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
966 |
switch (bt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
967 |
case T_INT: { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
968 |
jint value = arg.get_jint(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
969 |
if (-1 <= value && value <= 5) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
970 |
emit_bc(Bytecodes::cast(Bytecodes::_iconst_0 + value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
971 |
else |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
972 |
emit_bc(Bytecodes::_ldc, cpool_int_put(value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
973 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
974 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
975 |
case T_LONG: { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
976 |
jlong value = arg.get_jlong(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
977 |
if (0 <= value && value <= 1) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
978 |
emit_bc(Bytecodes::cast(Bytecodes::_lconst_0 + (int) value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
979 |
else |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
980 |
emit_bc(Bytecodes::_ldc2_w, cpool_long_put(value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
981 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
982 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
983 |
case T_FLOAT: { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
984 |
jfloat value = arg.get_jfloat(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
985 |
if (value == 0.0 || value == 1.0 || value == 2.0) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
986 |
emit_bc(Bytecodes::cast(Bytecodes::_fconst_0 + (int) value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
987 |
else |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
988 |
emit_bc(Bytecodes::_ldc, cpool_float_put(value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
989 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
990 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
991 |
case T_DOUBLE: { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
992 |
jdouble value = arg.get_jdouble(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
993 |
if (value == 0.0 || value == 1.0) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
994 |
emit_bc(Bytecodes::cast(Bytecodes::_dconst_0 + (int) value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
995 |
else |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
996 |
emit_bc(Bytecodes::_ldc2_w, cpool_double_put(value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
997 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
998 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
999 |
case T_OBJECT: { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1000 |
Handle value = arg.object(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1001 |
if (value.is_null()) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1002 |
emit_bc(Bytecodes::_aconst_null); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1003 |
else |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1004 |
emit_bc(Bytecodes::_ldc, cpool_object_put(value)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1005 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1006 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1007 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1008 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1009 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1010 |
stack_push(bt); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1011 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1012 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1013 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1014 |
MethodHandleWalker::ArgToken |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1015 |
MethodHandleCompiler::make_conversion(BasicType type, klassOop tk, Bytecodes::Code op, |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1016 |
const ArgToken& src, TRAPS) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1017 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1018 |
BasicType srctype = src.basic_type(); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1019 |
TokenType tt = src.token_type(); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1020 |
int index = -1; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1021 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1022 |
switch (op) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1023 |
case Bytecodes::_i2l: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1024 |
case Bytecodes::_i2f: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1025 |
case Bytecodes::_i2d: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1026 |
case Bytecodes::_i2b: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1027 |
case Bytecodes::_i2c: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1028 |
case Bytecodes::_i2s: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1029 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1030 |
case Bytecodes::_l2i: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1031 |
case Bytecodes::_l2f: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1032 |
case Bytecodes::_l2d: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1033 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1034 |
case Bytecodes::_f2i: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1035 |
case Bytecodes::_f2l: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1036 |
case Bytecodes::_f2d: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1037 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1038 |
case Bytecodes::_d2i: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1039 |
case Bytecodes::_d2l: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1040 |
case Bytecodes::_d2f: |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1041 |
if (tt == tt_constant) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1042 |
emit_load_constant(src); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1043 |
} else { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1044 |
emit_load(srctype, src.index()); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1045 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1046 |
stack_pop(srctype); // pop the src type |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1047 |
emit_bc(op); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1048 |
stack_push(type); // push the dest value |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1049 |
if (tt != tt_constant) |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1050 |
index = src.index(); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1051 |
if (srctype != type || index == -1) |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1052 |
index = new_local_index(type); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1053 |
emit_store(type, index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1054 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1055 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1056 |
case Bytecodes::_checkcast: |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1057 |
if (tt == tt_constant) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1058 |
emit_load_constant(src); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1059 |
} else { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1060 |
emit_load(srctype, src.index()); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1061 |
index = src.index(); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1062 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1063 |
emit_bc(op, cpool_klass_put(tk)); |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1064 |
if (index == -1) |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1065 |
index = new_local_index(type); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1066 |
emit_store(srctype, index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1067 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1068 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1069 |
default: |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1070 |
if (op == Bytecodes::_illegal) |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1071 |
lose("no such primitive conversion", THREAD); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1072 |
else |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1073 |
lose("bad primitive conversion op", THREAD); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1074 |
return make_prim_constant(type, &zero_jvalue, THREAD); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1075 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1076 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1077 |
return make_parameter(type, tk, index, THREAD); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1078 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1079 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1080 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1081 |
// ----------------------------------------------------------------------------- |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1082 |
// MethodHandleCompiler |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1083 |
// |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1084 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1085 |
// Values used by the compiler. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1086 |
jvalue MethodHandleCompiler::zero_jvalue = { 0 }; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1087 |
jvalue MethodHandleCompiler::one_jvalue = { 1 }; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1088 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1089 |
// Emit bytecodes for the given invoke instruction. |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1090 |
MethodHandleWalker::ArgToken |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1091 |
MethodHandleCompiler::make_invoke(methodOop m, vmIntrinsics::ID iid, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1092 |
Bytecodes::Code op, bool tailcall, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1093 |
int argc, MethodHandleWalker::ArgToken* argv, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1094 |
TRAPS) { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1095 |
ArgToken zero; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1096 |
if (m == NULL) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1097 |
// Get the intrinsic methodOop. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1098 |
m = vmIntrinsics::method_for(iid); |
8675
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8296
diff
changeset
|
1099 |
if (m == NULL) { |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8296
diff
changeset
|
1100 |
lose(vmIntrinsics::name_at(iid), CHECK_(zero)); |
e9fef2a9bef7
6839872: remove implementation inheritance from JSR 292 APIs
jrose
parents:
8296
diff
changeset
|
1101 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1102 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1103 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1104 |
klassOop klass = m->method_holder(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1105 |
Symbol* name = m->name(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1106 |
Symbol* signature = m->signature(); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1107 |
|
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1108 |
// Count the number of arguments, not the size |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1109 |
ArgumentCount asc(signature); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1110 |
assert(argc == asc.size() + ((op == Bytecodes::_invokestatic || op == Bytecodes::_invokedynamic) ? 0 : 1), |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1111 |
"argc mismatch"); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1112 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1113 |
if (tailcall) { |
4581
e89fbd1bcb3d
6914206: change way of permission checking for generated MethodHandle adapters
twisti
parents:
4571
diff
changeset
|
1114 |
// Actually, in order to make these methods more recognizable, |
7426
dba53a0065f8
7001363: java/dyn/InvokeDynamic should not be a well-known class in the JVM
twisti
parents:
7397
diff
changeset
|
1115 |
// let's put them in holder class MethodHandle. That way stack |
dba53a0065f8
7001363: java/dyn/InvokeDynamic should not be a well-known class in the JVM
twisti
parents:
7397
diff
changeset
|
1116 |
// walkers and compiler heuristics can recognize them. |
dba53a0065f8
7001363: java/dyn/InvokeDynamic should not be a well-known class in the JVM
twisti
parents:
7397
diff
changeset
|
1117 |
_target_klass = SystemDictionary::MethodHandle_klass(); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1118 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1119 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1120 |
// Inline the method. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1121 |
InvocationCounter* ic = m->invocation_counter(); |
6453 | 1122 |
ic->set_carry_flag(); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1123 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1124 |
for (int i = 0; i < argc; i++) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1125 |
ArgToken arg = argv[i]; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1126 |
TokenType tt = arg.token_type(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1127 |
BasicType bt = arg.basic_type(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1128 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1129 |
switch (tt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1130 |
case tt_parameter: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1131 |
case tt_temporary: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1132 |
emit_load(bt, arg.index()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1133 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1134 |
case tt_constant: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1135 |
emit_load_constant(arg); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1136 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1137 |
case tt_illegal: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1138 |
// Sentinel. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1139 |
assert(i == (argc - 1), "sentinel must be last entry"); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1140 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1141 |
case tt_void: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1142 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1143 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1144 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1145 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1146 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1147 |
// Populate constant pool. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1148 |
int name_index = cpool_symbol_put(name); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1149 |
int signature_index = cpool_symbol_put(signature); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1150 |
int name_and_type_index = cpool_name_and_type_put(name_index, signature_index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1151 |
int klass_index = cpool_klass_put(klass); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1152 |
int methodref_index = cpool_methodref_put(klass_index, name_and_type_index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1153 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1154 |
// Generate invoke. |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1155 |
switch (op) { |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1156 |
case Bytecodes::_invokestatic: |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1157 |
case Bytecodes::_invokespecial: |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1158 |
case Bytecodes::_invokevirtual: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1159 |
emit_bc(op, methodref_index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1160 |
break; |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1161 |
|
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1162 |
case Bytecodes::_invokeinterface: { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1163 |
ArgumentSizeComputer asc(signature); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1164 |
emit_bc(op, methodref_index, asc.size() + 1); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1165 |
break; |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1166 |
} |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1167 |
|
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1168 |
default: |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1169 |
ShouldNotReachHere(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1170 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1171 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1172 |
// If tailcall, we have walked all the way to a direct method handle. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1173 |
// Otherwise, make a recursive call to some helper routine. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1174 |
BasicType rbt = m->result_type(); |
4581
e89fbd1bcb3d
6914206: change way of permission checking for generated MethodHandle adapters
twisti
parents:
4571
diff
changeset
|
1175 |
if (rbt == T_ARRAY) rbt = T_OBJECT; |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1176 |
stack_push(rbt); // The return value is already pushed onto the stack. |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1177 |
ArgToken ret; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1178 |
if (tailcall) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1179 |
if (rbt != _rtype) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1180 |
if (rbt == T_VOID) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1181 |
// push a zero of the right sort |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1182 |
if (_rtype == T_OBJECT) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1183 |
zero = make_oop_constant(NULL, CHECK_(zero)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1184 |
} else { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1185 |
zero = make_prim_constant(_rtype, &zero_jvalue, CHECK_(zero)); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1186 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1187 |
emit_load_constant(zero); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1188 |
} else if (_rtype == T_VOID) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1189 |
// We'll emit a _return with something on the stack. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1190 |
// It's OK to ignore what's on the stack. |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1191 |
} else if (rbt == T_INT && is_subword_type(_rtype)) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1192 |
// Convert value to match return type. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1193 |
switch (_rtype) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1194 |
case T_BOOLEAN: { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1195 |
// boolean is treated as a one-bit unsigned integer. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1196 |
// Cf. API documentation: java/lang/invoke/MethodHandles.html#explicitCastArguments |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1197 |
ArgToken one = make_prim_constant(T_INT, &one_jvalue, CHECK_(zero)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1198 |
emit_load_constant(one); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1199 |
emit_bc(Bytecodes::_iand); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1200 |
break; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1201 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1202 |
case T_BYTE: emit_bc(Bytecodes::_i2b); break; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1203 |
case T_CHAR: emit_bc(Bytecodes::_i2c); break; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1204 |
case T_SHORT: emit_bc(Bytecodes::_i2s); break; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1205 |
default: ShouldNotReachHere(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1206 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1207 |
} else if (is_subword_type(rbt) && (is_subword_type(_rtype) || (_rtype == T_INT))) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1208 |
// The subword type was returned as an int and will be passed |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1209 |
// on as an int. |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1210 |
} else { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1211 |
lose("unknown conversion", CHECK_(zero)); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1212 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1213 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1214 |
switch (_rtype) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1215 |
case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1216 |
case T_INT: emit_bc(Bytecodes::_ireturn); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1217 |
case T_LONG: emit_bc(Bytecodes::_lreturn); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1218 |
case T_FLOAT: emit_bc(Bytecodes::_freturn); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1219 |
case T_DOUBLE: emit_bc(Bytecodes::_dreturn); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1220 |
case T_VOID: emit_bc(Bytecodes::_return); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1221 |
case T_OBJECT: |
4571 | 1222 |
if (_rklass.not_null() && _rklass() != SystemDictionary::Object_klass()) |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1223 |
emit_bc(Bytecodes::_checkcast, cpool_klass_put(_rklass())); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1224 |
emit_bc(Bytecodes::_areturn); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1225 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1226 |
default: ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1227 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1228 |
ret = ArgToken(); // Dummy return value. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1229 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1230 |
else { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1231 |
int index = new_local_index(rbt); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1232 |
switch (rbt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1233 |
case T_BOOLEAN: case T_BYTE: case T_CHAR: case T_SHORT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1234 |
case T_INT: case T_LONG: case T_FLOAT: case T_DOUBLE: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1235 |
case T_OBJECT: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1236 |
emit_store(rbt, index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1237 |
ret = ArgToken(tt_temporary, rbt, index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1238 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1239 |
case T_VOID: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1240 |
ret = ArgToken(tt_void); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1241 |
break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1242 |
default: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1243 |
ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1244 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1245 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1246 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1247 |
return ret; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1248 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1249 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1250 |
MethodHandleWalker::ArgToken |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1251 |
MethodHandleCompiler::make_fetch(BasicType type, klassOop tk, Bytecodes::Code op, |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1252 |
const MethodHandleWalker::ArgToken& base, |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1253 |
const MethodHandleWalker::ArgToken& offset, |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1254 |
TRAPS) { |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1255 |
switch (base.token_type()) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1256 |
case tt_parameter: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1257 |
case tt_temporary: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1258 |
emit_load(base.basic_type(), base.index()); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1259 |
break; |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1260 |
case tt_constant: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1261 |
emit_load_constant(base); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1262 |
break; |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1263 |
default: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1264 |
ShouldNotReachHere(); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1265 |
} |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1266 |
switch (offset.token_type()) { |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1267 |
case tt_parameter: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1268 |
case tt_temporary: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1269 |
emit_load(offset.basic_type(), offset.index()); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1270 |
break; |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1271 |
case tt_constant: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1272 |
emit_load_constant(offset); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1273 |
break; |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1274 |
default: |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1275 |
ShouldNotReachHere(); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1276 |
} |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1277 |
emit_bc(op); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1278 |
int index = new_local_index(type); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1279 |
emit_store(type, index); |
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1280 |
return ArgToken(tt_temporary, type, index); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1281 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1282 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1283 |
|
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1284 |
int MethodHandleCompiler::cpool_primitive_put(BasicType bt, jvalue* con) { |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1285 |
jvalue con_copy; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1286 |
assert(bt < T_OBJECT, ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1287 |
if (type2aelembytes(bt) < jintSize) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1288 |
// widen to int |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1289 |
con_copy = (*con); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1290 |
con = &con_copy; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1291 |
switch (bt) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1292 |
case T_BOOLEAN: con->i = (con->z ? 1 : 0); break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1293 |
case T_BYTE: con->i = con->b; break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1294 |
case T_CHAR: con->i = con->c; break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1295 |
case T_SHORT: con->i = con->s; break; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1296 |
default: ShouldNotReachHere(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1297 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1298 |
bt = T_INT; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1299 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1300 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1301 |
// for (int i = 1, imax = _constants.length(); i < imax; i++) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1302 |
// ConstantValue* con = _constants.at(i); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1303 |
// if (con != NULL && con->is_primitive() && con->_type == bt) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1304 |
// bool match = false; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1305 |
// switch (type2size[bt]) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1306 |
// case 1: if (pcon->_value.i == con->i) match = true; break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1307 |
// case 2: if (pcon->_value.j == con->j) match = true; break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1308 |
// } |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1309 |
// if (match) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1310 |
// return i; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1311 |
// } |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1312 |
// } |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1313 |
ConstantValue* cv = new ConstantValue(bt, *con); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1314 |
int index = _constants.append(cv); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1315 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1316 |
// long and double entries take 2 slots, we add another empty entry. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1317 |
if (type2size[bt] == 2) |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1318 |
(void) _constants.append(NULL); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1319 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1320 |
return index; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1321 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1322 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1323 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1324 |
constantPoolHandle MethodHandleCompiler::get_constant_pool(TRAPS) const { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1325 |
constantPoolHandle nullHandle; |
8296
b1c2163e4e59
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
8076
diff
changeset
|
1326 |
constantPoolOop cpool_oop = oopFactory::new_constantPool(_constants.length(), |
b1c2163e4e59
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
8076
diff
changeset
|
1327 |
oopDesc::IsSafeConc, |
b1c2163e4e59
6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),"Missing Printezis bit?")
ysr
parents:
8076
diff
changeset
|
1328 |
CHECK_(nullHandle)); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1329 |
constantPoolHandle cpool(THREAD, cpool_oop); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1330 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1331 |
// Fill the real constant pool skipping the zero element. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1332 |
for (int i = 1; i < _constants.length(); i++) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1333 |
ConstantValue* cv = _constants.at(i); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1334 |
switch (cv->tag()) { |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7888
diff
changeset
|
1335 |
case JVM_CONSTANT_Utf8: cpool->symbol_at_put( i, cv->symbol() ); break; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1336 |
case JVM_CONSTANT_Integer: cpool->int_at_put( i, cv->get_jint() ); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1337 |
case JVM_CONSTANT_Float: cpool->float_at_put( i, cv->get_jfloat() ); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1338 |
case JVM_CONSTANT_Long: cpool->long_at_put( i, cv->get_jlong() ); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1339 |
case JVM_CONSTANT_Double: cpool->double_at_put( i, cv->get_jdouble() ); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1340 |
case JVM_CONSTANT_Class: cpool->klass_at_put( i, cv->klass_oop() ); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1341 |
case JVM_CONSTANT_Methodref: cpool->method_at_put( i, cv->first_index(), cv->second_index()); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1342 |
case JVM_CONSTANT_NameAndType: cpool->name_and_type_at_put(i, cv->first_index(), cv->second_index()); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1343 |
case JVM_CONSTANT_Object: cpool->object_at_put( i, cv->object_oop() ); break; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1344 |
default: ShouldNotReachHere(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1345 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1346 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1347 |
switch (cv->tag()) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1348 |
case JVM_CONSTANT_Long: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1349 |
case JVM_CONSTANT_Double: |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1350 |
i++; // Skip empty entry. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1351 |
assert(_constants.at(i) == NULL, "empty entry"); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1352 |
break; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1353 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1354 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1355 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1356 |
// Set the constant pool holder to the target method's class. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1357 |
cpool->set_pool_holder(_target_klass()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1358 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1359 |
return cpool; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1360 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1361 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1362 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1363 |
methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const { |
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1364 |
methodHandle empty; |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1365 |
// Create a method that holds the generated bytecode. invokedynamic |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1366 |
// has no receiver, normal MH calls do. |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1367 |
int flags_bits; |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1368 |
if (for_invokedynamic()) |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
4581
diff
changeset
|
1369 |
flags_bits = (/*JVM_MH_INVOKE_BITS |*/ JVM_ACC_PUBLIC | JVM_ACC_FINAL | JVM_ACC_SYNTHETIC | JVM_ACC_STATIC); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1370 |
else |
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
4581
diff
changeset
|
1371 |
flags_bits = (/*JVM_MH_INVOKE_BITS |*/ JVM_ACC_PUBLIC | JVM_ACC_FINAL | JVM_ACC_SYNTHETIC); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1372 |
|
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1373 |
// Create a new method |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1374 |
methodHandle m; |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1375 |
{ |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1376 |
methodOop m_oop = oopFactory::new_method(bytecode_length(), |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1377 |
accessFlags_from(flags_bits), |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1378 |
0, 0, 0, oopDesc::IsSafeConc, CHECK_(empty)); |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1379 |
m = methodHandle(THREAD, m_oop); |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1380 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1381 |
|
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1382 |
constantPoolHandle cpool = get_constant_pool(CHECK_(empty)); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1383 |
m->set_constants(cpool()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1384 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1385 |
m->set_name_index(_name_index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1386 |
m->set_signature_index(_signature_index); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1387 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1388 |
m->set_code((address) bytecode()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1389 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1390 |
m->set_max_stack(_max_stack); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1391 |
m->set_max_locals(max_locals()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1392 |
m->set_size_of_parameters(_num_params); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1393 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1394 |
typeArrayHandle exception_handlers(THREAD, Universe::the_empty_int_array()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1395 |
m->set_exception_table(exception_handlers()); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1396 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1397 |
// Rewrite the method and set up the constant pool cache. |
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1398 |
objArrayOop m_array = oopFactory::new_system_objArray(1, CHECK_(empty)); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1399 |
objArrayHandle methods(THREAD, m_array); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1400 |
methods->obj_at_put(0, m()); |
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1401 |
Rewriter::rewrite(_target_klass(), cpool, methods, CHECK_(empty)); // Use fake class. |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1402 |
|
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1403 |
// Set the invocation counter's count to the invoke count of the |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1404 |
// original call site. |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1405 |
InvocationCounter* ic = m->invocation_counter(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1406 |
ic->set(InvocationCounter::wait_for_compile, _invoke_count); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1407 |
|
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1408 |
// Create a new MDO |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1409 |
{ |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1410 |
methodDataOop mdo = oopFactory::new_methodData(m, CHECK_(empty)); |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1411 |
assert(m->method_data() == NULL, "there should not be an MDO yet"); |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1412 |
m->set_method_data(mdo); |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1413 |
|
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1414 |
// Iterate over all profile data and set the count of the counter |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1415 |
// data entries to the original call site counter. |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1416 |
for (ProfileData* profile_data = mdo->first_data(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1417 |
mdo->is_valid(profile_data); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1418 |
profile_data = mdo->next_data(profile_data)) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1419 |
if (profile_data->is_CounterData()) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1420 |
CounterData* counter_data = profile_data->as_CounterData(); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1421 |
counter_data->set_count(_invoke_count); |
9633
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1422 |
} |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1423 |
} |
92a7a2841a16
7042122: JSR 292: adjust various inline thresholds for JSR 292 API methods and method handle adapters
twisti
parents:
9630
diff
changeset
|
1424 |
} |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1425 |
|
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1426 |
#ifndef PRODUCT |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1427 |
if (TraceMethodHandles) { |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1428 |
m->print(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1429 |
m->print_codes(); |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1430 |
} |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1431 |
#endif //PRODUCT |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1432 |
|
5420
586d3988e72b
6939134: JSR 292 adjustments to method handle invocation
jrose
parents:
4581
diff
changeset
|
1433 |
assert(m->is_method_handle_adapter(), "must be recognized as an adapter"); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4562
diff
changeset
|
1434 |
return m; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1435 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1436 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1437 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1438 |
#ifndef PRODUCT |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1439 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1440 |
// MH printer for debugging. |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1441 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1442 |
class MethodHandlePrinter : public MethodHandleWalker { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1443 |
private: |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1444 |
outputStream* _out; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1445 |
bool _verbose; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1446 |
int _temp_num; |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1447 |
int _param_state; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1448 |
stringStream _strbuf; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1449 |
const char* strbuf() { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1450 |
const char* s = _strbuf.as_string(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1451 |
_strbuf.reset(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1452 |
return s; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1453 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1454 |
ArgToken token(const char* str) { |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1455 |
return ArgToken(str); |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1456 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1457 |
const char* string(ArgToken token) { |
9946
b3d5b50e2289
7045513: JSR 292 inlining causes crashes in methodHandleWalk.cpp
never
parents:
9943
diff
changeset
|
1458 |
return token.str(); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1459 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1460 |
void start_params() { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1461 |
_param_state <<= 1; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1462 |
_out->print("("); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1463 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1464 |
void end_params() { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1465 |
if (_verbose) _out->print("\n"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1466 |
_out->print(") => {"); |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1467 |
_param_state >>= 1; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1468 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1469 |
void put_type_name(BasicType type, klassOop tk, outputStream* s) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1470 |
const char* kname = NULL; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1471 |
if (tk != NULL) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1472 |
kname = Klass::cast(tk)->external_name(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1473 |
s->print("%s", (kname != NULL) ? kname : type2name(type)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1474 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1475 |
ArgToken maybe_make_temp(const char* statement_op, BasicType type, const char* temp_name) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1476 |
const char* value = strbuf(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1477 |
if (!_verbose) return token(value); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1478 |
// make an explicit binding for each separate value |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1479 |
_strbuf.print("%s%d", temp_name, ++_temp_num); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1480 |
const char* temp = strbuf(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1481 |
_out->print("\n %s %s %s = %s;", statement_op, type2name(type), temp, value); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1482 |
return token(temp); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1483 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1484 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1485 |
public: |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1486 |
MethodHandlePrinter(Handle root, bool verbose, outputStream* out, TRAPS) |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1487 |
: MethodHandleWalker(root, false, THREAD), |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1488 |
_out(out), |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1489 |
_verbose(verbose), |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1490 |
_param_state(0), |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1491 |
_temp_num(0) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1492 |
{ |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1493 |
start_params(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1494 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1495 |
virtual ArgToken make_parameter(BasicType type, klassOop tk, int argnum, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1496 |
if (argnum < 0) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1497 |
end_params(); |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1498 |
return token("return"); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1499 |
} |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1500 |
if ((_param_state & 1) == 0) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1501 |
_param_state |= 1; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1502 |
_out->print(_verbose ? "\n " : ""); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1503 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1504 |
_out->print(_verbose ? ",\n " : ", "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1505 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1506 |
if (argnum >= _temp_num) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1507 |
_temp_num = argnum; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1508 |
// generate an argument name |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1509 |
_strbuf.print("a%d", argnum); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1510 |
const char* arg = strbuf(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1511 |
put_type_name(type, tk, _out); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1512 |
_out->print(" %s", arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1513 |
return token(arg); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1514 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1515 |
virtual ArgToken make_oop_constant(oop con, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1516 |
if (con == NULL) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1517 |
_strbuf.print("null"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1518 |
else |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1519 |
con->print_value_on(&_strbuf); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1520 |
if (_strbuf.size() == 0) { // yuck |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1521 |
_strbuf.print("(a "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1522 |
put_type_name(T_OBJECT, con->klass(), &_strbuf); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1523 |
_strbuf.print(")"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1524 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1525 |
return maybe_make_temp("constant", T_OBJECT, "k"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1526 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1527 |
virtual ArgToken make_prim_constant(BasicType type, jvalue* con, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1528 |
java_lang_boxing_object::print(type, con, &_strbuf); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1529 |
return maybe_make_temp("constant", type, "k"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1530 |
} |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1531 |
void print_bytecode_name(Bytecodes::Code op) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1532 |
if (Bytecodes::is_defined(op)) |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1533 |
_strbuf.print("%s", Bytecodes::name(op)); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1534 |
else |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1535 |
_strbuf.print("bytecode_%d", (int) op); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1536 |
} |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1537 |
virtual ArgToken make_conversion(BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& src, TRAPS) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1538 |
print_bytecode_name(op); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1539 |
_strbuf.print("(%s", string(src)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1540 |
if (tk != NULL) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1541 |
_strbuf.print(", "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1542 |
put_type_name(type, tk, &_strbuf); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1543 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1544 |
_strbuf.print(")"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1545 |
return maybe_make_temp("convert", type, "v"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1546 |
} |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1547 |
virtual ArgToken make_fetch(BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& base, const ArgToken& offset, TRAPS) { |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1548 |
_strbuf.print("%s(%s, %s", Bytecodes::name(op), string(base), string(offset)); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1549 |
if (tk != NULL) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1550 |
_strbuf.print(", "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1551 |
put_type_name(type, tk, &_strbuf); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1552 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1553 |
_strbuf.print(")"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1554 |
return maybe_make_temp("fetch", type, "x"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1555 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1556 |
virtual ArgToken make_invoke(methodOop m, vmIntrinsics::ID iid, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1557 |
Bytecodes::Code op, bool tailcall, |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1558 |
int argc, ArgToken* argv, TRAPS) { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1559 |
Symbol* name; |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1560 |
Symbol* sig; |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1561 |
if (m != NULL) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1562 |
name = m->name(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1563 |
sig = m->signature(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1564 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1565 |
name = vmSymbols::symbol_at(vmIntrinsics::name_for(iid)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1566 |
sig = vmSymbols::symbol_at(vmIntrinsics::signature_for(iid)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1567 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1568 |
_strbuf.print("%s %s%s(", Bytecodes::name(op), name->as_C_string(), sig->as_C_string()); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1569 |
for (int i = 0; i < argc; i++) { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1570 |
_strbuf.print("%s%s", (i > 0 ? ", " : ""), string(argv[i])); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1571 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1572 |
_strbuf.print(")"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1573 |
if (!tailcall) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1574 |
BasicType rt = char2type(sig->byte_at(sig->utf8_length()-1)); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1575 |
if (rt == T_ILLEGAL) rt = T_OBJECT; // ';' at the end of '(...)L...;' |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1576 |
return maybe_make_temp("invoke", rt, "x"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1577 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1578 |
const char* ret = strbuf(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1579 |
_out->print(_verbose ? "\n return " : " "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1580 |
_out->print("%s", ret); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1581 |
_out->print(_verbose ? "\n}\n" : " }"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1582 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1583 |
return ArgToken(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1584 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1585 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1586 |
virtual void set_method_handle(oop mh) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1587 |
if (WizardMode && Verbose) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1588 |
tty->print("\n--- next target: "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1589 |
mh->print(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1590 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1591 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1592 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1593 |
static void print(Handle root, bool verbose, outputStream* out, TRAPS) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1594 |
ResourceMark rm; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1595 |
MethodHandlePrinter printer(root, verbose, out, CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1596 |
printer.walk(CHECK); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1597 |
out->print("\n"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1598 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1599 |
static void print(Handle root, bool verbose = Verbose, outputStream* out = tty) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1600 |
EXCEPTION_MARK; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1601 |
ResourceMark rm; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1602 |
MethodHandlePrinter printer(root, verbose, out, THREAD); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1603 |
if (!HAS_PENDING_EXCEPTION) |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1604 |
printer.walk(THREAD); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1605 |
if (HAS_PENDING_EXCEPTION) { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1606 |
oop ex = PENDING_EXCEPTION; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1607 |
CLEAR_PENDING_EXCEPTION; |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1608 |
out->print(" *** "); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1609 |
if (printer.lose_message() != NULL) out->print("%s ", printer.lose_message()); |
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1610 |
out->print("}"); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1611 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1612 |
out->print("\n"); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1613 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1614 |
}; |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1615 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1616 |
extern "C" |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1617 |
void print_method_handle(oop mh) { |
6463
f4362c8da849
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
6453
diff
changeset
|
1618 |
if (!mh->is_oop()) { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1619 |
tty->print_cr("*** not a method handle: "PTR_FORMAT, (intptr_t)mh); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8675
diff
changeset
|
1620 |
} else if (java_lang_invoke_MethodHandle::is_instance(mh)) { |
9638
a9e79f5cd83b
6998541: JSR 292 implement missing return-type conversion for OP_RETYPE_RAW
twisti
parents:
9633
diff
changeset
|
1621 |
MethodHandlePrinter::print(mh); |
4562
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1622 |
} else { |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1623 |
tty->print("*** not a method handle: "); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1624 |
mh->print(); |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1625 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1626 |
} |
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1627 |
|
5d93cb2d2090
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
diff
changeset
|
1628 |
#endif // PRODUCT |