Mercurial > hg > graal-compiler
annotate src/share/vm/code/dependencies.cpp @ 14313:44315152d434
8028391: Make the Min/MaxHeapFreeRatio flags manageable
Summary: Made the flags Min- and MaxHeapFreeRatio manageable, and implemented support for these flags in ParallalGC.
Reviewed-by: sla, mgerdin, brutisso
author | jwilhelm |
---|---|
date | Wed, 29 Jan 2014 23:17:05 +0100 |
parents | 3e2b76368121 |
children | cb0dc98c287d |
rev | line source |
---|---|
0 | 1 /* |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
11034
diff
changeset
|
2 * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1206
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1206
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1206
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
26 #include "ci/ciArrayKlass.hpp" | |
27 #include "ci/ciEnv.hpp" | |
28 #include "ci/ciKlass.hpp" | |
29 #include "ci/ciMethod.hpp" | |
30 #include "code/dependencies.hpp" | |
31 #include "compiler/compileLog.hpp" | |
32 #include "oops/oop.inline.hpp" | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
33 #include "runtime/handles.hpp" |
1972 | 34 #include "runtime/handles.inline.hpp" |
35 #include "utilities/copy.hpp" | |
0 | 36 |
37 | |
38 #ifdef ASSERT | |
39 static bool must_be_in_vm() { | |
40 Thread* thread = Thread::current(); | |
41 if (thread->is_Java_thread()) | |
42 return ((JavaThread*)thread)->thread_state() == _thread_in_vm; | |
43 else | |
44 return true; //something like this: thread->is_VM_thread(); | |
45 } | |
46 #endif //ASSERT | |
47 | |
48 void Dependencies::initialize(ciEnv* env) { | |
49 Arena* arena = env->arena(); | |
50 _oop_recorder = env->oop_recorder(); | |
51 _log = env->log(); | |
52 _dep_seen = new(arena) GrowableArray<int>(arena, 500, 0, 0); | |
53 DEBUG_ONLY(_deps[end_marker] = NULL); | |
54 for (int i = (int)FIRST_TYPE; i < (int)TYPE_LIMIT; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
55 _deps[i] = new(arena) GrowableArray<ciBaseObject*>(arena, 10, 0, 0); |
0 | 56 } |
57 _content_bytes = NULL; | |
58 _size_in_bytes = (size_t)-1; | |
59 | |
60 assert(TYPE_LIMIT <= (1<<LG2_TYPE_LIMIT), "sanity"); | |
61 } | |
62 | |
63 void Dependencies::assert_evol_method(ciMethod* m) { | |
64 assert_common_1(evol_method, m); | |
65 } | |
66 | |
67 void Dependencies::assert_leaf_type(ciKlass* ctxk) { | |
68 if (ctxk->is_array_klass()) { | |
69 // As a special case, support this assertion on an array type, | |
70 // which reduces to an assertion on its element type. | |
71 // Note that this cannot be done with assertions that | |
72 // relate to concreteness or abstractness. | |
73 ciType* elemt = ctxk->as_array_klass()->base_element_type(); | |
74 if (!elemt->is_instance_klass()) return; // Ex: int[][] | |
75 ctxk = elemt->as_instance_klass(); | |
76 //if (ctxk->is_final()) return; // Ex: String[][] | |
77 } | |
78 check_ctxk(ctxk); | |
79 assert_common_1(leaf_type, ctxk); | |
80 } | |
81 | |
82 void Dependencies::assert_abstract_with_unique_concrete_subtype(ciKlass* ctxk, ciKlass* conck) { | |
83 check_ctxk_abstract(ctxk); | |
84 assert_common_2(abstract_with_unique_concrete_subtype, ctxk, conck); | |
85 } | |
86 | |
87 void Dependencies::assert_abstract_with_no_concrete_subtype(ciKlass* ctxk) { | |
88 check_ctxk_abstract(ctxk); | |
89 assert_common_1(abstract_with_no_concrete_subtype, ctxk); | |
90 } | |
91 | |
92 void Dependencies::assert_concrete_with_no_concrete_subtype(ciKlass* ctxk) { | |
93 check_ctxk_concrete(ctxk); | |
94 assert_common_1(concrete_with_no_concrete_subtype, ctxk); | |
95 } | |
96 | |
97 void Dependencies::assert_unique_concrete_method(ciKlass* ctxk, ciMethod* uniqm) { | |
98 check_ctxk(ctxk); | |
99 assert_common_2(unique_concrete_method, ctxk, uniqm); | |
100 } | |
101 | |
102 void Dependencies::assert_abstract_with_exclusive_concrete_subtypes(ciKlass* ctxk, ciKlass* k1, ciKlass* k2) { | |
103 check_ctxk(ctxk); | |
104 assert_common_3(abstract_with_exclusive_concrete_subtypes_2, ctxk, k1, k2); | |
105 } | |
106 | |
107 void Dependencies::assert_exclusive_concrete_methods(ciKlass* ctxk, ciMethod* m1, ciMethod* m2) { | |
108 check_ctxk(ctxk); | |
109 assert_common_3(exclusive_concrete_methods_2, ctxk, m1, m2); | |
110 } | |
111 | |
112 void Dependencies::assert_has_no_finalizable_subclasses(ciKlass* ctxk) { | |
113 check_ctxk(ctxk); | |
114 assert_common_1(no_finalizable_subclasses, ctxk); | |
115 } | |
116 | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
117 void Dependencies::assert_call_site_target_value(ciCallSite* call_site, ciMethodHandle* method_handle) { |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
118 check_ctxk(call_site->klass()); |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
119 assert_common_2(call_site_target_value, call_site, method_handle); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
120 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
121 |
0 | 122 // Helper function. If we are adding a new dep. under ctxk2, |
123 // try to find an old dep. under a broader* ctxk1. If there is | |
124 // | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
125 bool Dependencies::maybe_merge_ctxk(GrowableArray<ciBaseObject*>* deps, |
0 | 126 int ctxk_i, ciKlass* ctxk2) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
127 ciKlass* ctxk1 = deps->at(ctxk_i)->as_metadata()->as_klass(); |
0 | 128 if (ctxk2->is_subtype_of(ctxk1)) { |
129 return true; // success, and no need to change | |
130 } else if (ctxk1->is_subtype_of(ctxk2)) { | |
131 // new context class fully subsumes previous one | |
132 deps->at_put(ctxk_i, ctxk2); | |
133 return true; | |
134 } else { | |
135 return false; | |
136 } | |
137 } | |
138 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
139 void Dependencies::assert_common_1(DepType dept, ciBaseObject* x) { |
0 | 140 assert(dep_args(dept) == 1, "sanity"); |
141 log_dependency(dept, x); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
142 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 143 |
144 // see if the same (or a similar) dep is already recorded | |
145 if (note_dep_seen(dept, x)) { | |
146 assert(deps->find(x) >= 0, "sanity"); | |
147 } else { | |
148 deps->append(x); | |
149 } | |
150 } | |
151 | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
152 void Dependencies::assert_common_2(DepType dept, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
153 ciBaseObject* x0, ciBaseObject* x1) { |
0 | 154 assert(dep_args(dept) == 2, "sanity"); |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
155 log_dependency(dept, x0, x1); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
156 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 157 |
158 // see if the same (or a similar) dep is already recorded | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
159 bool has_ctxk = has_explicit_context_arg(dept); |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
160 if (has_ctxk) { |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
161 assert(dep_context_arg(dept) == 0, "sanity"); |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
162 if (note_dep_seen(dept, x1)) { |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
163 // look in this bucket for redundant assertions |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
164 const int stride = 2; |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
165 for (int i = deps->length(); (i -= stride) >= 0; ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
166 ciBaseObject* y1 = deps->at(i+1); |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
167 if (x1 == y1) { // same subject; check the context |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
168 if (maybe_merge_ctxk(deps, i+0, x0->as_metadata()->as_klass())) { |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
169 return; |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
170 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
171 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
172 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
173 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
174 } else { |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
175 assert(dep_implicit_context_arg(dept) == 0, "sanity"); |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
176 if (note_dep_seen(dept, x0) && note_dep_seen(dept, x1)) { |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
177 // look in this bucket for redundant assertions |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
178 const int stride = 2; |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
179 for (int i = deps->length(); (i -= stride) >= 0; ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
180 ciBaseObject* y0 = deps->at(i+0); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
181 ciBaseObject* y1 = deps->at(i+1); |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
182 if (x0 == y0 && x1 == y1) { |
0 | 183 return; |
184 } | |
185 } | |
186 } | |
187 } | |
188 | |
189 // append the assertion in the correct bucket: | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
190 deps->append(x0); |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
191 deps->append(x1); |
0 | 192 } |
193 | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
194 void Dependencies::assert_common_3(DepType dept, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
195 ciKlass* ctxk, ciBaseObject* x, ciBaseObject* x2) { |
0 | 196 assert(dep_context_arg(dept) == 0, "sanity"); |
197 assert(dep_args(dept) == 3, "sanity"); | |
198 log_dependency(dept, ctxk, x, x2); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
199 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 200 |
201 // try to normalize an unordered pair: | |
202 bool swap = false; | |
203 switch (dept) { | |
204 case abstract_with_exclusive_concrete_subtypes_2: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
205 swap = (x->ident() > x2->ident() && x->as_metadata()->as_klass() != ctxk); |
0 | 206 break; |
207 case exclusive_concrete_methods_2: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
208 swap = (x->ident() > x2->ident() && x->as_metadata()->as_method()->holder() != ctxk); |
0 | 209 break; |
210 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
211 if (swap) { ciBaseObject* t = x; x = x2; x2 = t; } |
0 | 212 |
213 // see if the same (or a similar) dep is already recorded | |
214 if (note_dep_seen(dept, x) && note_dep_seen(dept, x2)) { | |
215 // look in this bucket for redundant assertions | |
216 const int stride = 3; | |
217 for (int i = deps->length(); (i -= stride) >= 0; ) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
218 ciBaseObject* y = deps->at(i+1); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
219 ciBaseObject* y2 = deps->at(i+2); |
0 | 220 if (x == y && x2 == y2) { // same subjects; check the context |
221 if (maybe_merge_ctxk(deps, i+0, ctxk)) { | |
222 return; | |
223 } | |
224 } | |
225 } | |
226 } | |
227 // append the assertion in the correct bucket: | |
228 deps->append(ctxk); | |
229 deps->append(x); | |
230 deps->append(x2); | |
231 } | |
232 | |
233 /// Support for encoding dependencies into an nmethod: | |
234 | |
235 void Dependencies::copy_to(nmethod* nm) { | |
236 address beg = nm->dependencies_begin(); | |
237 address end = nm->dependencies_end(); | |
238 guarantee(end - beg >= (ptrdiff_t) size_in_bytes(), "bad sizing"); | |
239 Copy::disjoint_words((HeapWord*) content_bytes(), | |
240 (HeapWord*) beg, | |
241 size_in_bytes() / sizeof(HeapWord)); | |
242 assert(size_in_bytes() % sizeof(HeapWord) == 0, "copy by words"); | |
243 } | |
244 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
245 static int sort_dep(ciBaseObject** p1, ciBaseObject** p2, int narg) { |
0 | 246 for (int i = 0; i < narg; i++) { |
247 int diff = p1[i]->ident() - p2[i]->ident(); | |
248 if (diff != 0) return diff; | |
249 } | |
250 return 0; | |
251 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
252 static int sort_dep_arg_1(ciBaseObject** p1, ciBaseObject** p2) |
0 | 253 { return sort_dep(p1, p2, 1); } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
254 static int sort_dep_arg_2(ciBaseObject** p1, ciBaseObject** p2) |
0 | 255 { return sort_dep(p1, p2, 2); } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
256 static int sort_dep_arg_3(ciBaseObject** p1, ciBaseObject** p2) |
0 | 257 { return sort_dep(p1, p2, 3); } |
258 | |
259 void Dependencies::sort_all_deps() { | |
260 for (int deptv = (int)FIRST_TYPE; deptv < (int)TYPE_LIMIT; deptv++) { | |
261 DepType dept = (DepType)deptv; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
262 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 263 if (deps->length() <= 1) continue; |
264 switch (dep_args(dept)) { | |
265 case 1: deps->sort(sort_dep_arg_1, 1); break; | |
266 case 2: deps->sort(sort_dep_arg_2, 2); break; | |
267 case 3: deps->sort(sort_dep_arg_3, 3); break; | |
268 default: ShouldNotReachHere(); | |
269 } | |
270 } | |
271 } | |
272 | |
273 size_t Dependencies::estimate_size_in_bytes() { | |
274 size_t est_size = 100; | |
275 for (int deptv = (int)FIRST_TYPE; deptv < (int)TYPE_LIMIT; deptv++) { | |
276 DepType dept = (DepType)deptv; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
277 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 278 est_size += deps->length()*2; // tags and argument(s) |
279 } | |
280 return est_size; | |
281 } | |
282 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
283 ciKlass* Dependencies::ctxk_encoded_as_null(DepType dept, ciBaseObject* x) { |
0 | 284 switch (dept) { |
285 case abstract_with_exclusive_concrete_subtypes_2: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
286 return x->as_metadata()->as_klass(); |
0 | 287 case unique_concrete_method: |
288 case exclusive_concrete_methods_2: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
289 return x->as_metadata()->as_method()->holder(); |
0 | 290 } |
291 return NULL; // let NULL be NULL | |
292 } | |
293 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
294 Klass* Dependencies::ctxk_encoded_as_null(DepType dept, Metadata* x) { |
0 | 295 assert(must_be_in_vm(), "raw oops here"); |
296 switch (dept) { | |
297 case abstract_with_exclusive_concrete_subtypes_2: | |
298 assert(x->is_klass(), "sanity"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
299 return (Klass*) x; |
0 | 300 case unique_concrete_method: |
301 case exclusive_concrete_methods_2: | |
302 assert(x->is_method(), "sanity"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
303 return ((Method*)x)->method_holder(); |
0 | 304 } |
305 return NULL; // let NULL be NULL | |
306 } | |
307 | |
308 void Dependencies::encode_content_bytes() { | |
309 sort_all_deps(); | |
310 | |
311 // cast is safe, no deps can overflow INT_MAX | |
312 CompressedWriteStream bytes((int)estimate_size_in_bytes()); | |
313 | |
314 for (int deptv = (int)FIRST_TYPE; deptv < (int)TYPE_LIMIT; deptv++) { | |
315 DepType dept = (DepType)deptv; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
316 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 317 if (deps->length() == 0) continue; |
318 int stride = dep_args(dept); | |
319 int ctxkj = dep_context_arg(dept); // -1 if no context arg | |
320 assert(stride > 0, "sanity"); | |
321 for (int i = 0; i < deps->length(); i += stride) { | |
322 jbyte code_byte = (jbyte)dept; | |
323 int skipj = -1; | |
324 if (ctxkj >= 0 && ctxkj+1 < stride) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
325 ciKlass* ctxk = deps->at(i+ctxkj+0)->as_metadata()->as_klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
326 ciBaseObject* x = deps->at(i+ctxkj+1); // following argument |
0 | 327 if (ctxk == ctxk_encoded_as_null(dept, x)) { |
328 skipj = ctxkj; // we win: maybe one less oop to keep track of | |
329 code_byte |= default_context_type_bit; | |
330 } | |
331 } | |
332 bytes.write_byte(code_byte); | |
333 for (int j = 0; j < stride; j++) { | |
334 if (j == skipj) continue; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
335 ciBaseObject* v = deps->at(i+j); |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
336 int idx; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
337 if (v->is_object()) { |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
338 idx = _oop_recorder->find_index(v->as_object()->constant_encoding()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
339 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
340 ciMetadata* meta = v->as_metadata(); |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
341 idx = _oop_recorder->find_index(meta->constant_encoding()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
342 } |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
343 bytes.write_int(idx); |
0 | 344 } |
345 } | |
346 } | |
347 | |
348 // write a sentinel byte to mark the end | |
349 bytes.write_byte(end_marker); | |
350 | |
351 // round it out to a word boundary | |
352 while (bytes.position() % sizeof(HeapWord) != 0) { | |
353 bytes.write_byte(end_marker); | |
354 } | |
355 | |
356 // check whether the dept byte encoding really works | |
357 assert((jbyte)default_context_type_bit != 0, "byte overflow"); | |
358 | |
359 _content_bytes = bytes.buffer(); | |
360 _size_in_bytes = bytes.position(); | |
361 } | |
362 | |
363 | |
364 const char* Dependencies::_dep_name[TYPE_LIMIT] = { | |
365 "end_marker", | |
366 "evol_method", | |
367 "leaf_type", | |
368 "abstract_with_unique_concrete_subtype", | |
369 "abstract_with_no_concrete_subtype", | |
370 "concrete_with_no_concrete_subtype", | |
371 "unique_concrete_method", | |
372 "abstract_with_exclusive_concrete_subtypes_2", | |
373 "exclusive_concrete_methods_2", | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
374 "no_finalizable_subclasses", |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
375 "call_site_target_value" |
0 | 376 }; |
377 | |
378 int Dependencies::_dep_args[TYPE_LIMIT] = { | |
379 -1,// end_marker | |
380 1, // evol_method m | |
381 1, // leaf_type ctxk | |
382 2, // abstract_with_unique_concrete_subtype ctxk, k | |
383 1, // abstract_with_no_concrete_subtype ctxk | |
384 1, // concrete_with_no_concrete_subtype ctxk | |
385 2, // unique_concrete_method ctxk, m | |
386 3, // unique_concrete_subtypes_2 ctxk, k1, k2 | |
387 3, // unique_concrete_methods_2 ctxk, m1, m2 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
388 1, // no_finalizable_subclasses ctxk |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
389 2 // call_site_target_value call_site, method_handle |
0 | 390 }; |
391 | |
392 const char* Dependencies::dep_name(Dependencies::DepType dept) { | |
393 if (!dept_in_mask(dept, all_types)) return "?bad-dep?"; | |
394 return _dep_name[dept]; | |
395 } | |
396 | |
397 int Dependencies::dep_args(Dependencies::DepType dept) { | |
398 if (!dept_in_mask(dept, all_types)) return -1; | |
399 return _dep_args[dept]; | |
400 } | |
401 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
402 void Dependencies::check_valid_dependency_type(DepType dept) { |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
403 guarantee(FIRST_TYPE <= dept && dept < TYPE_LIMIT, err_msg("invalid dependency type: %d", (int) dept)); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
404 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
405 |
0 | 406 // for the sake of the compiler log, print out current dependencies: |
407 void Dependencies::log_all_dependencies() { | |
408 if (log() == NULL) return; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
409 ciBaseObject* args[max_arg_count]; |
0 | 410 for (int deptv = (int)FIRST_TYPE; deptv < (int)TYPE_LIMIT; deptv++) { |
411 DepType dept = (DepType)deptv; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
412 GrowableArray<ciBaseObject*>* deps = _deps[dept]; |
0 | 413 if (deps->length() == 0) continue; |
414 int stride = dep_args(dept); | |
415 for (int i = 0; i < deps->length(); i += stride) { | |
416 for (int j = 0; j < stride; j++) { | |
417 // flush out the identities before printing | |
418 args[j] = deps->at(i+j); | |
419 } | |
420 write_dependency_to(log(), dept, stride, args); | |
421 } | |
422 } | |
423 } | |
424 | |
425 void Dependencies::write_dependency_to(CompileLog* log, | |
426 DepType dept, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
427 int nargs, DepArgument args[], |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
428 Klass* witness) { |
0 | 429 if (log == NULL) { |
430 return; | |
431 } | |
432 ciEnv* env = ciEnv::current(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
433 ciBaseObject* ciargs[max_arg_count]; |
0 | 434 assert(nargs <= max_arg_count, "oob"); |
435 for (int j = 0; j < nargs; j++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
436 if (args[j].is_oop()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
437 ciargs[j] = env->get_object(args[j].oop_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
438 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
439 ciargs[j] = env->get_metadata(args[j].metadata_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
440 } |
0 | 441 } |
442 Dependencies::write_dependency_to(log, dept, nargs, ciargs, witness); | |
443 } | |
444 | |
445 void Dependencies::write_dependency_to(CompileLog* log, | |
446 DepType dept, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
447 int nargs, ciBaseObject* args[], |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
448 Klass* witness) { |
0 | 449 if (log == NULL) return; |
450 assert(nargs <= max_arg_count, "oob"); | |
451 int argids[max_arg_count]; | |
452 int ctxkj = dep_context_arg(dept); // -1 if no context arg | |
453 int j; | |
454 for (j = 0; j < nargs; j++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
455 if (args[j]->is_object()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
456 argids[j] = log->identify(args[j]->as_object()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
457 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
458 argids[j] = log->identify(args[j]->as_metadata()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
459 } |
0 | 460 } |
461 if (witness != NULL) { | |
462 log->begin_elem("dependency_failed"); | |
463 } else { | |
464 log->begin_elem("dependency"); | |
465 } | |
466 log->print(" type='%s'", dep_name(dept)); | |
467 if (ctxkj >= 0) { | |
468 log->print(" ctxk='%d'", argids[ctxkj]); | |
469 } | |
470 // write remaining arguments, if any. | |
471 for (j = 0; j < nargs; j++) { | |
472 if (j == ctxkj) continue; // already logged | |
473 if (j == 1) { | |
474 log->print( " x='%d'", argids[j]); | |
475 } else { | |
476 log->print(" x%d='%d'", j, argids[j]); | |
477 } | |
478 } | |
479 if (witness != NULL) { | |
480 log->object("witness", witness); | |
481 log->stamp(); | |
482 } | |
483 log->end_elem(); | |
484 } | |
485 | |
486 void Dependencies::write_dependency_to(xmlStream* xtty, | |
487 DepType dept, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
488 int nargs, DepArgument args[], |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
489 Klass* witness) { |
0 | 490 if (xtty == NULL) return; |
491 ttyLocker ttyl; | |
492 int ctxkj = dep_context_arg(dept); // -1 if no context arg | |
493 if (witness != NULL) { | |
494 xtty->begin_elem("dependency_failed"); | |
495 } else { | |
496 xtty->begin_elem("dependency"); | |
497 } | |
498 xtty->print(" type='%s'", dep_name(dept)); | |
499 if (ctxkj >= 0) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
500 xtty->object("ctxk", args[ctxkj].metadata_value()); |
0 | 501 } |
502 // write remaining arguments, if any. | |
503 for (int j = 0; j < nargs; j++) { | |
504 if (j == ctxkj) continue; // already logged | |
505 if (j == 1) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
506 if (args[j].is_oop()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
507 xtty->object("x", args[j].oop_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
508 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
509 xtty->object("x", args[j].metadata_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
510 } |
0 | 511 } else { |
512 char xn[10]; sprintf(xn, "x%d", j); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
513 if (args[j].is_oop()) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
514 xtty->object(xn, args[j].oop_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
515 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
516 xtty->object(xn, args[j].metadata_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
517 } |
0 | 518 } |
519 } | |
520 if (witness != NULL) { | |
521 xtty->object("witness", witness); | |
522 xtty->stamp(); | |
523 } | |
524 xtty->end_elem(); | |
525 } | |
526 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
527 void Dependencies::print_dependency(DepType dept, int nargs, DepArgument args[], |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
528 Klass* witness) { |
0 | 529 ResourceMark rm; |
530 ttyLocker ttyl; // keep the following output all in one block | |
531 tty->print_cr("%s of type %s", | |
532 (witness == NULL)? "Dependency": "Failed dependency", | |
533 dep_name(dept)); | |
534 // print arguments | |
535 int ctxkj = dep_context_arg(dept); // -1 if no context arg | |
536 for (int j = 0; j < nargs; j++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
537 DepArgument arg = args[j]; |
0 | 538 bool put_star = false; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
539 if (arg.is_null()) continue; |
0 | 540 const char* what; |
541 if (j == ctxkj) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
542 assert(arg.is_metadata(), "must be"); |
0 | 543 what = "context"; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
544 put_star = !Dependencies::is_concrete_klass((Klass*)arg.metadata_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
545 } else if (arg.is_method()) { |
0 | 546 what = "method "; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
547 put_star = !Dependencies::is_concrete_method((Method*)arg.metadata_value()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
548 } else if (arg.is_klass()) { |
0 | 549 what = "class "; |
550 } else { | |
551 what = "object "; | |
552 } | |
553 tty->print(" %s = %s", what, (put_star? "*": "")); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
554 if (arg.is_klass()) |
6983 | 555 tty->print("%s", ((Klass*)arg.metadata_value())->external_name()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
556 else if (arg.is_method()) |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
557 ((Method*)arg.metadata_value())->print_value(); |
0 | 558 else |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
559 ShouldNotReachHere(); // Provide impl for this type. |
0 | 560 tty->cr(); |
561 } | |
562 if (witness != NULL) { | |
563 bool put_star = !Dependencies::is_concrete_klass(witness); | |
564 tty->print_cr(" witness = %s%s", | |
565 (put_star? "*": ""), | |
6983 | 566 witness->external_name()); |
0 | 567 } |
568 } | |
569 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
570 void Dependencies::DepStream::log_dependency(Klass* witness) { |
0 | 571 if (_deps == NULL && xtty == NULL) return; // fast cutout for runtime |
6972
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
572 ResourceMark rm; |
0 | 573 int nargs = argument_count(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
574 DepArgument args[max_arg_count]; |
0 | 575 for (int j = 0; j < nargs; j++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
576 if (type() == call_site_target_value) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
577 args[j] = argument_oop(j); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
578 } else { |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
579 args[j] = argument(j); |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
580 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
581 } |
0 | 582 if (_deps != NULL && _deps->log() != NULL) { |
583 Dependencies::write_dependency_to(_deps->log(), | |
584 type(), nargs, args, witness); | |
585 } else { | |
586 Dependencies::write_dependency_to(xtty, | |
587 type(), nargs, args, witness); | |
588 } | |
589 } | |
590 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
591 void Dependencies::DepStream::print_dependency(Klass* witness, bool verbose) { |
0 | 592 int nargs = argument_count(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
593 DepArgument args[max_arg_count]; |
0 | 594 for (int j = 0; j < nargs; j++) { |
595 args[j] = argument(j); | |
596 } | |
597 Dependencies::print_dependency(type(), nargs, args, witness); | |
598 if (verbose) { | |
599 if (_code != NULL) { | |
600 tty->print(" code: "); | |
601 _code->print_value_on(tty); | |
602 tty->cr(); | |
603 } | |
604 } | |
605 } | |
606 | |
607 | |
608 /// Dependency stream support (decodes dependencies from an nmethod): | |
609 | |
610 #ifdef ASSERT | |
611 void Dependencies::DepStream::initial_asserts(size_t byte_limit) { | |
612 assert(must_be_in_vm(), "raw oops here"); | |
613 _byte_limit = byte_limit; | |
614 _type = (DepType)(end_marker-1); // defeat "already at end" assert | |
615 assert((_code!=NULL) + (_deps!=NULL) == 1, "one or t'other"); | |
616 } | |
617 #endif //ASSERT | |
618 | |
619 bool Dependencies::DepStream::next() { | |
620 assert(_type != end_marker, "already at end"); | |
621 if (_bytes.position() == 0 && _code != NULL | |
622 && _code->dependencies_size() == 0) { | |
623 // Method has no dependencies at all. | |
624 return false; | |
625 } | |
626 int code_byte = (_bytes.read_byte() & 0xFF); | |
627 if (code_byte == end_marker) { | |
628 DEBUG_ONLY(_type = end_marker); | |
629 return false; | |
630 } else { | |
631 int ctxk_bit = (code_byte & Dependencies::default_context_type_bit); | |
632 code_byte -= ctxk_bit; | |
633 DepType dept = (DepType)code_byte; | |
634 _type = dept; | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
635 Dependencies::check_valid_dependency_type(dept); |
0 | 636 int stride = _dep_args[dept]; |
637 assert(stride == dep_args(dept), "sanity"); | |
638 int skipj = -1; | |
639 if (ctxk_bit != 0) { | |
640 skipj = 0; // currently the only context argument is at zero | |
641 assert(skipj == dep_context_arg(dept), "zero arg always ctxk"); | |
642 } | |
643 for (int j = 0; j < stride; j++) { | |
644 _xi[j] = (j == skipj)? 0: _bytes.read_int(); | |
645 } | |
646 DEBUG_ONLY(_xi[stride] = -1); // help detect overruns | |
647 return true; | |
648 } | |
649 } | |
650 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
651 inline Metadata* Dependencies::DepStream::recorded_metadata_at(int i) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
652 Metadata* o = NULL; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
653 if (_code != NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
654 o = _code->metadata_at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
655 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
656 o = _deps->oop_recorder()->metadata_at(i); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
657 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
658 return o; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
659 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
660 |
0 | 661 inline oop Dependencies::DepStream::recorded_oop_at(int i) { |
662 return (_code != NULL) | |
663 ? _code->oop_at(i) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
664 : JNIHandles::resolve(_deps->oop_recorder()->oop_at(i)); |
0 | 665 } |
666 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
667 Metadata* Dependencies::DepStream::argument(int i) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
668 Metadata* result = recorded_metadata_at(argument_index(i)); |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
669 |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
670 if (result == NULL) { // Explicit context argument can be compressed |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
671 int ctxkj = dep_context_arg(type()); // -1 if no explicit context arg |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
672 if (ctxkj >= 0 && i == ctxkj && ctxkj+1 < argument_count()) { |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
673 result = ctxk_encoded_as_null(type(), argument(ctxkj+1)); |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
674 } |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
675 } |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
676 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
677 assert(result == NULL || result->is_klass() || result->is_method(), "must be"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
678 return result; |
0 | 679 } |
680 | |
14262
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
681 /** |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
682 * Returns a unique identifier for each dependency argument. |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
683 */ |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
684 uintptr_t Dependencies::DepStream::get_identifier(int i) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
685 if (has_oop_argument()) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
686 return (uintptr_t)(oopDesc*)argument_oop(i); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
687 } else { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
688 return (uintptr_t)argument(i); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
689 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
690 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
691 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
692 oop Dependencies::DepStream::argument_oop(int i) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
693 oop result = recorded_oop_at(argument_index(i)); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
694 assert(result == NULL || result->is_oop(), "must be"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
695 return result; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
696 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
697 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
698 Klass* Dependencies::DepStream::context_type() { |
0 | 699 assert(must_be_in_vm(), "raw oops here"); |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
700 |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
701 // Most dependencies have an explicit context type argument. |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
702 { |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
703 int ctxkj = dep_context_arg(type()); // -1 if no explicit context arg |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
704 if (ctxkj >= 0) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
705 Metadata* k = argument(ctxkj); |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
706 assert(k != NULL && k->is_klass(), "type check"); |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
707 return (Klass*)k; |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
708 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
709 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
710 |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
711 // Some dependencies are using the klass of the first object |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
712 // argument as implicit context type (e.g. call_site_target_value). |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
713 { |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
714 int ctxkj = dep_implicit_context_arg(type()); |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
715 if (ctxkj >= 0) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
716 Klass* k = argument_oop(ctxkj)->klass(); |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
717 assert(k != NULL && k->is_klass(), "type check"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
718 return (Klass*) k; |
0 | 719 } |
720 } | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
721 |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
722 // And some dependencies don't have a context type at all, |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
723 // e.g. evol_method. |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
724 return NULL; |
0 | 725 } |
726 | |
14262
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
727 // ----------------- DependencySignature -------------------------------------- |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
728 bool DependencySignature::equals(const DependencySignature& sig) const { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
729 if (type() != sig.type()) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
730 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
731 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
732 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
733 if (args_count() != sig.args_count()) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
734 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
735 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
736 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
737 for (int i = 0; i < sig.args_count(); i++) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
738 if (arg(i) != sig.arg(i)) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
739 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
740 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
741 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
742 return true; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
743 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
744 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
745 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
746 // ----------------- DependencySignatureBuffer -------------------------------------- |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
747 DependencySignatureBuffer::DependencySignatureBuffer() { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
748 _signatures = NEW_RESOURCE_ARRAY(GrowableArray<DependencySignature*>*, Dependencies::TYPE_LIMIT); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
749 memset(_signatures, 0, sizeof(DependencySignature*) * Dependencies::TYPE_LIMIT); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
750 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
751 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
752 /* Check if arguments are identical. Two dependency signatures are considered |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
753 * identical, if the type as well as all argument identifiers are identical. |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
754 * If the dependency has not already been checked, the dependency signature is |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
755 * added to the checked dependencies of the same type. The function returns |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
756 * false, which causes the dependency to be checked in the caller. |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
757 */ |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
758 bool DependencySignatureBuffer::add_if_missing(const DependencySignature& sig) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
759 const int index = sig.type(); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
760 GrowableArray<DependencySignature*>* buffer = _signatures[index]; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
761 if (buffer == NULL) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
762 buffer = new GrowableArray<DependencySignature*>(); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
763 _signatures[index] = buffer; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
764 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
765 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
766 // Check if we have already checked the dependency |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
767 for (int i = 0; i < buffer->length(); i++) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
768 DependencySignature* checked_signature = buffer->at(i); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
769 if (checked_signature->equals(sig)) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
770 return true; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
771 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
772 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
773 buffer->append((DependencySignature*)&sig); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
774 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
775 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
776 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
777 |
0 | 778 /// Checking dependencies: |
779 | |
780 // This hierarchy walker inspects subtypes of a given type, | |
781 // trying to find a "bad" class which breaks a dependency. | |
782 // Such a class is called a "witness" to the broken dependency. | |
783 // While searching around, we ignore "participants", which | |
784 // are already known to the dependency. | |
785 class ClassHierarchyWalker { | |
786 public: | |
787 enum { PARTICIPANT_LIMIT = 3 }; | |
788 | |
789 private: | |
790 // optional method descriptor to check for: | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
791 Symbol* _name; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
792 Symbol* _signature; |
0 | 793 |
794 // special classes which are not allowed to be witnesses: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
795 Klass* _participants[PARTICIPANT_LIMIT+1]; |
0 | 796 int _num_participants; |
797 | |
798 // cache of method lookups | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
799 Method* _found_methods[PARTICIPANT_LIMIT+1]; |
0 | 800 |
801 // if non-zero, tells how many witnesses to convert to participants | |
802 int _record_witnesses; | |
803 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
804 void initialize(Klass* participant) { |
0 | 805 _record_witnesses = 0; |
806 _participants[0] = participant; | |
807 _found_methods[0] = NULL; | |
808 _num_participants = 0; | |
809 if (participant != NULL) { | |
810 // Terminating NULL. | |
811 _participants[1] = NULL; | |
812 _found_methods[1] = NULL; | |
813 _num_participants = 1; | |
814 } | |
815 } | |
816 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
817 void initialize_from_method(Method* m) { |
0 | 818 assert(m != NULL && m->is_method(), "sanity"); |
819 _name = m->name(); | |
820 _signature = m->signature(); | |
821 } | |
822 | |
823 public: | |
824 // The walker is initialized to recognize certain methods and/or types | |
825 // as friendly participants. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
826 ClassHierarchyWalker(Klass* participant, Method* m) { |
0 | 827 initialize_from_method(m); |
828 initialize(participant); | |
829 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
830 ClassHierarchyWalker(Method* m) { |
0 | 831 initialize_from_method(m); |
832 initialize(NULL); | |
833 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
834 ClassHierarchyWalker(Klass* participant = NULL) { |
0 | 835 _name = NULL; |
836 _signature = NULL; | |
837 initialize(participant); | |
838 } | |
839 | |
840 // This is common code for two searches: One for concrete subtypes, | |
841 // the other for concrete method implementations and overrides. | |
842 bool doing_subtype_search() { | |
843 return _name == NULL; | |
844 } | |
845 | |
846 int num_participants() { return _num_participants; } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
847 Klass* participant(int n) { |
0 | 848 assert((uint)n <= (uint)_num_participants, "oob"); |
849 return _participants[n]; | |
850 } | |
851 | |
852 // Note: If n==num_participants, returns NULL. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
853 Method* found_method(int n) { |
0 | 854 assert((uint)n <= (uint)_num_participants, "oob"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
855 Method* fm = _found_methods[n]; |
0 | 856 assert(n == _num_participants || fm != NULL, "proper usage"); |
857 assert(fm == NULL || fm->method_holder() == _participants[n], "sanity"); | |
858 return fm; | |
859 } | |
860 | |
861 #ifdef ASSERT | |
862 // Assert that m is inherited into ctxk, without intervening overrides. | |
863 // (May return true even if this is not true, in corner cases where we punt.) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
864 bool check_method_context(Klass* ctxk, Method* m) { |
0 | 865 if (m->method_holder() == ctxk) |
866 return true; // Quick win. | |
867 if (m->is_private()) | |
868 return false; // Quick lose. Should not happen. | |
869 if (!(m->is_public() || m->is_protected())) | |
870 // The override story is complex when packages get involved. | |
871 return true; // Must punt the assertion to true. | |
6983 | 872 Klass* k = ctxk; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
873 Method* lm = k->lookup_method(m->name(), m->signature()); |
0 | 874 if (lm == NULL && k->oop_is_instance()) { |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
11034
diff
changeset
|
875 // It might be an interface method |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
11034
diff
changeset
|
876 lm = ((InstanceKlass*)k)->lookup_method_in_ordered_interfaces(m->name(), |
0 | 877 m->signature()); |
878 } | |
879 if (lm == m) | |
880 // Method m is inherited into ctxk. | |
881 return true; | |
882 if (lm != NULL) { | |
4060 | 883 if (!(lm->is_public() || lm->is_protected())) { |
0 | 884 // Method is [package-]private, so the override story is complex. |
885 return true; // Must punt the assertion to true. | |
4060 | 886 } |
887 if (lm->is_static()) { | |
888 // Static methods don't override non-static so punt | |
889 return true; | |
890 } | |
0 | 891 if ( !Dependencies::is_concrete_method(lm) |
892 && !Dependencies::is_concrete_method(m) | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6934
diff
changeset
|
893 && lm->method_holder()->is_subtype_of(m->method_holder())) |
0 | 894 // Method m is overridden by lm, but both are non-concrete. |
895 return true; | |
896 } | |
897 ResourceMark rm; | |
898 tty->print_cr("Dependency method not found in the associated context:"); | |
6983 | 899 tty->print_cr(" context = %s", ctxk->external_name()); |
0 | 900 tty->print( " method = "); m->print_short_name(tty); tty->cr(); |
901 if (lm != NULL) { | |
902 tty->print( " found = "); lm->print_short_name(tty); tty->cr(); | |
903 } | |
904 return false; | |
905 } | |
906 #endif | |
907 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
908 void add_participant(Klass* participant) { |
0 | 909 assert(_num_participants + _record_witnesses < PARTICIPANT_LIMIT, "oob"); |
910 int np = _num_participants++; | |
911 _participants[np] = participant; | |
912 _participants[np+1] = NULL; | |
913 _found_methods[np+1] = NULL; | |
914 } | |
915 | |
916 void record_witnesses(int add) { | |
917 if (add > PARTICIPANT_LIMIT) add = PARTICIPANT_LIMIT; | |
918 assert(_num_participants + add < PARTICIPANT_LIMIT, "oob"); | |
919 _record_witnesses = add; | |
920 } | |
921 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
922 bool is_witness(Klass* k) { |
0 | 923 if (doing_subtype_search()) { |
924 return Dependencies::is_concrete_klass(k); | |
925 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
926 Method* m = InstanceKlass::cast(k)->find_method(_name, _signature); |
0 | 927 if (m == NULL || !Dependencies::is_concrete_method(m)) return false; |
928 _found_methods[_num_participants] = m; | |
929 // Note: If add_participant(k) is called, | |
930 // the method m will already be memoized for it. | |
931 return true; | |
932 } | |
933 } | |
934 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
935 bool is_participant(Klass* k) { |
0 | 936 if (k == _participants[0]) { |
937 return true; | |
938 } else if (_num_participants <= 1) { | |
939 return false; | |
940 } else { | |
941 return in_list(k, &_participants[1]); | |
942 } | |
943 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
944 bool ignore_witness(Klass* witness) { |
0 | 945 if (_record_witnesses == 0) { |
946 return false; | |
947 } else { | |
948 --_record_witnesses; | |
949 add_participant(witness); | |
950 return true; | |
951 } | |
952 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
953 static bool in_list(Klass* x, Klass** list) { |
0 | 954 for (int i = 0; ; i++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
955 Klass* y = list[i]; |
0 | 956 if (y == NULL) break; |
957 if (y == x) return true; | |
958 } | |
959 return false; // not in list | |
960 } | |
961 | |
962 private: | |
963 // the actual search method: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
964 Klass* find_witness_anywhere(Klass* context_type, |
0 | 965 bool participants_hide_witnesses, |
966 bool top_level_call = true); | |
967 // the spot-checking version: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
968 Klass* find_witness_in(KlassDepChange& changes, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
969 Klass* context_type, |
0 | 970 bool participants_hide_witnesses); |
971 public: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
972 Klass* find_witness_subtype(Klass* context_type, KlassDepChange* changes = NULL) { |
0 | 973 assert(doing_subtype_search(), "must set up a subtype search"); |
974 // When looking for unexpected concrete types, | |
975 // do not look beneath expected ones. | |
976 const bool participants_hide_witnesses = true; | |
977 // CX > CC > C' is OK, even if C' is new. | |
978 // CX > { CC, C' } is not OK if C' is new, and C' is the witness. | |
979 if (changes != NULL) { | |
980 return find_witness_in(*changes, context_type, participants_hide_witnesses); | |
981 } else { | |
982 return find_witness_anywhere(context_type, participants_hide_witnesses); | |
983 } | |
984 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
985 Klass* find_witness_definer(Klass* context_type, KlassDepChange* changes = NULL) { |
0 | 986 assert(!doing_subtype_search(), "must set up a method definer search"); |
987 // When looking for unexpected concrete methods, | |
988 // look beneath expected ones, to see if there are overrides. | |
989 const bool participants_hide_witnesses = true; | |
990 // CX.m > CC.m > C'.m is not OK, if C'.m is new, and C' is the witness. | |
991 if (changes != NULL) { | |
992 return find_witness_in(*changes, context_type, !participants_hide_witnesses); | |
993 } else { | |
994 return find_witness_anywhere(context_type, !participants_hide_witnesses); | |
995 } | |
996 } | |
997 }; | |
998 | |
999 #ifndef PRODUCT | |
1000 static int deps_find_witness_calls = 0; | |
1001 static int deps_find_witness_steps = 0; | |
1002 static int deps_find_witness_recursions = 0; | |
1003 static int deps_find_witness_singles = 0; | |
1004 static int deps_find_witness_print = 0; // set to -1 to force a final print | |
1005 static bool count_find_witness_calls() { | |
1006 if (TraceDependencies || LogCompilation) { | |
1007 int pcount = deps_find_witness_print + 1; | |
1008 bool final_stats = (pcount == 0); | |
1009 bool initial_call = (pcount == 1); | |
1010 bool occasional_print = ((pcount & ((1<<10) - 1)) == 0); | |
1011 if (pcount < 0) pcount = 1; // crude overflow protection | |
1012 deps_find_witness_print = pcount; | |
1013 if (VerifyDependencies && initial_call) { | |
1014 tty->print_cr("Warning: TraceDependencies results may be inflated by VerifyDependencies"); | |
1015 } | |
1016 if (occasional_print || final_stats) { | |
1017 // Every now and then dump a little info about dependency searching. | |
1018 if (xtty != NULL) { | |
1206
87684f1a88b5
6614597: Performance variability in jvm2008 xml.validation
kvn
parents:
1123
diff
changeset
|
1019 ttyLocker ttyl; |
87684f1a88b5
6614597: Performance variability in jvm2008 xml.validation
kvn
parents:
1123
diff
changeset
|
1020 xtty->elem("deps_find_witness calls='%d' steps='%d' recursions='%d' singles='%d'", |
0 | 1021 deps_find_witness_calls, |
1022 deps_find_witness_steps, | |
1023 deps_find_witness_recursions, | |
1024 deps_find_witness_singles); | |
1025 } | |
1026 if (final_stats || (TraceDependencies && WizardMode)) { | |
1206
87684f1a88b5
6614597: Performance variability in jvm2008 xml.validation
kvn
parents:
1123
diff
changeset
|
1027 ttyLocker ttyl; |
0 | 1028 tty->print_cr("Dependency check (find_witness) " |
1029 "calls=%d, steps=%d (avg=%.1f), recursions=%d, singles=%d", | |
1030 deps_find_witness_calls, | |
1031 deps_find_witness_steps, | |
1032 (double)deps_find_witness_steps / deps_find_witness_calls, | |
1033 deps_find_witness_recursions, | |
1034 deps_find_witness_singles); | |
1035 } | |
1036 } | |
1037 return true; | |
1038 } | |
1039 return false; | |
1040 } | |
1041 #else | |
1042 #define count_find_witness_calls() (0) | |
1043 #endif //PRODUCT | |
1044 | |
1045 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1046 Klass* ClassHierarchyWalker::find_witness_in(KlassDepChange& changes, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1047 Klass* context_type, |
0 | 1048 bool participants_hide_witnesses) { |
1049 assert(changes.involves_context(context_type), "irrelevant dependency"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1050 Klass* new_type = changes.new_type(); |
0 | 1051 |
10973
ef57c43512d6
8014431: cleanup warnings indicated by the -Wunused-value compiler option on linux
ccheung
parents:
6985
diff
changeset
|
1052 (void)count_find_witness_calls(); |
0 | 1053 NOT_PRODUCT(deps_find_witness_singles++); |
1054 | |
1055 // Current thread must be in VM (not native mode, as in CI): | |
1056 assert(must_be_in_vm(), "raw oops here"); | |
1057 // Must not move the class hierarchy during this check: | |
1058 assert_locked_or_safepoint(Compile_lock); | |
1059 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1060 int nof_impls = InstanceKlass::cast(context_type)->nof_implementors(); |
30 | 1061 if (nof_impls > 1) { |
1062 // Avoid this case: *I.m > { A.m, C }; B.m > C | |
1063 // %%% Until this is fixed more systematically, bail out. | |
1064 // See corresponding comment in find_witness_anywhere. | |
1065 return context_type; | |
1066 } | |
1067 | |
0 | 1068 assert(!is_participant(new_type), "only old classes are participants"); |
1069 if (participants_hide_witnesses) { | |
1070 // If the new type is a subtype of a participant, we are done. | |
1071 for (int i = 0; i < num_participants(); i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1072 Klass* part = participant(i); |
0 | 1073 if (part == NULL) continue; |
6983 | 1074 assert(changes.involves_context(part) == new_type->is_subtype_of(part), |
0 | 1075 "correct marking of participants, b/c new_type is unique"); |
1076 if (changes.involves_context(part)) { | |
1077 // new guy is protected from this check by previous participant | |
1078 return NULL; | |
1079 } | |
1080 } | |
1081 } | |
1082 | |
1083 if (is_witness(new_type) && | |
1084 !ignore_witness(new_type)) { | |
1085 return new_type; | |
1086 } | |
1087 | |
1088 return NULL; | |
1089 } | |
1090 | |
1091 | |
1092 // Walk hierarchy under a context type, looking for unexpected types. | |
1093 // Do not report participant types, and recursively walk beneath | |
1094 // them only if participants_hide_witnesses is false. | |
1095 // If top_level_call is false, skip testing the context type, | |
1096 // because the caller has already considered it. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1097 Klass* ClassHierarchyWalker::find_witness_anywhere(Klass* context_type, |
0 | 1098 bool participants_hide_witnesses, |
1099 bool top_level_call) { | |
1100 // Current thread must be in VM (not native mode, as in CI): | |
1101 assert(must_be_in_vm(), "raw oops here"); | |
1102 // Must not move the class hierarchy during this check: | |
1103 assert_locked_or_safepoint(Compile_lock); | |
1104 | |
1105 bool do_counts = count_find_witness_calls(); | |
1106 | |
1107 // Check the root of the sub-hierarchy first. | |
1108 if (top_level_call) { | |
1109 if (do_counts) { | |
1110 NOT_PRODUCT(deps_find_witness_calls++); | |
1111 NOT_PRODUCT(deps_find_witness_steps++); | |
1112 } | |
1113 if (is_participant(context_type)) { | |
1114 if (participants_hide_witnesses) return NULL; | |
1115 // else fall through to search loop... | |
1116 } else if (is_witness(context_type) && !ignore_witness(context_type)) { | |
1117 // The context is an abstract class or interface, to start with. | |
1118 return context_type; | |
1119 } | |
1120 } | |
1121 | |
1122 // Now we must check each implementor and each subclass. | |
1123 // Use a short worklist to avoid blowing the stack. | |
1124 // Each worklist entry is a *chain* of subklass siblings to process. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1125 const int CHAINMAX = 100; // >= 1 + InstanceKlass::implementors_limit |
0 | 1126 Klass* chains[CHAINMAX]; |
1127 int chaini = 0; // index into worklist | |
1128 Klass* chain; // scratch variable | |
1129 #define ADD_SUBCLASS_CHAIN(k) { \ | |
1130 assert(chaini < CHAINMAX, "oob"); \ | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1131 chain = InstanceKlass::cast(k)->subklass(); \ |
0 | 1132 if (chain != NULL) chains[chaini++] = chain; } |
1133 | |
1134 // Look for non-abstract subclasses. | |
1135 // (Note: Interfaces do not have subclasses.) | |
1136 ADD_SUBCLASS_CHAIN(context_type); | |
1137 | |
1138 // If it is an interface, search its direct implementors. | |
1139 // (Their subclasses are additional indirect implementors. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1140 // See InstanceKlass::add_implementor.) |
0 | 1141 // (Note: nof_implementors is always zero for non-interfaces.) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1142 int nof_impls = InstanceKlass::cast(context_type)->nof_implementors(); |
0 | 1143 if (nof_impls > 1) { |
1144 // Avoid this case: *I.m > { A.m, C }; B.m > C | |
1145 // Here, I.m has 2 concrete implementations, but m appears unique | |
1146 // as A.m, because the search misses B.m when checking C. | |
1147 // The inherited method B.m was getting missed by the walker | |
1148 // when interface 'I' was the starting point. | |
1149 // %%% Until this is fixed more systematically, bail out. | |
1150 // (Old CHA had the same limitation.) | |
1151 return context_type; | |
1152 } | |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1153 if (nof_impls > 0) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1154 Klass* impl = InstanceKlass::cast(context_type)->implementor(); |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1155 assert(impl != NULL, "just checking"); |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1156 // If impl is the same as the context_type, then more than one |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1157 // implementor has seen. No exact info in this case. |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1158 if (impl == context_type) { |
0 | 1159 return context_type; // report an inexact witness to this sad affair |
1160 } | |
1161 if (do_counts) | |
1162 { NOT_PRODUCT(deps_find_witness_steps++); } | |
1163 if (is_participant(impl)) { | |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1164 if (!participants_hide_witnesses) { |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1165 ADD_SUBCLASS_CHAIN(impl); |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1166 } |
0 | 1167 } else if (is_witness(impl) && !ignore_witness(impl)) { |
1168 return impl; | |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1169 } else { |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1170 ADD_SUBCLASS_CHAIN(impl); |
0 | 1171 } |
1172 } | |
1173 | |
1174 // Recursively process each non-trivial sibling chain. | |
1175 while (chaini > 0) { | |
1176 Klass* chain = chains[--chaini]; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1177 for (Klass* sub = chain; sub != NULL; sub = sub->next_sibling()) { |
0 | 1178 if (do_counts) { NOT_PRODUCT(deps_find_witness_steps++); } |
1179 if (is_participant(sub)) { | |
1180 if (participants_hide_witnesses) continue; | |
1181 // else fall through to process this guy's subclasses | |
1182 } else if (is_witness(sub) && !ignore_witness(sub)) { | |
1183 return sub; | |
1184 } | |
1185 if (chaini < (VerifyDependencies? 2: CHAINMAX)) { | |
1186 // Fast path. (Partially disabled if VerifyDependencies.) | |
1187 ADD_SUBCLASS_CHAIN(sub); | |
1188 } else { | |
1189 // Worklist overflow. Do a recursive call. Should be rare. | |
1190 // The recursive call will have its own worklist, of course. | |
1191 // (Note that sub has already been tested, so that there is | |
1192 // no need for the recursive call to re-test. That's handy, | |
1193 // since the recursive call sees sub as the context_type.) | |
1194 if (do_counts) { NOT_PRODUCT(deps_find_witness_recursions++); } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1195 Klass* witness = find_witness_anywhere(sub, |
0 | 1196 participants_hide_witnesses, |
1197 /*top_level_call=*/ false); | |
1198 if (witness != NULL) return witness; | |
1199 } | |
1200 } | |
1201 } | |
1202 | |
1203 // No witness found. The dependency remains unbroken. | |
1204 return NULL; | |
1205 #undef ADD_SUBCLASS_CHAIN | |
1206 } | |
1207 | |
1208 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1209 bool Dependencies::is_concrete_klass(Klass* k) { |
6983 | 1210 if (k->is_abstract()) return false; |
0 | 1211 // %%% We could treat classes which are concrete but |
1212 // have not yet been instantiated as virtually abstract. | |
1213 // This would require a deoptimization barrier on first instantiation. | |
1214 //if (k->is_not_instantiated()) return false; | |
1215 return true; | |
1216 } | |
1217 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1218 bool Dependencies::is_concrete_method(Method* m) { |
4060 | 1219 // Statics are irrelevant to virtual call sites. |
1220 if (m->is_static()) return false; | |
1221 | |
1222 // We could also return false if m does not yet appear to be | |
1223 // executed, if the VM version supports this distinction also. | |
6934 | 1224 return !m->is_abstract() && |
1225 !InstanceKlass::cast(m->method_holder())->is_interface(); | |
1226 // TODO: investigate whether default methods should be | |
1227 // considered as "concrete" in this situation. For now they | |
1228 // are not. | |
0 | 1229 } |
1230 | |
1231 | |
1232 Klass* Dependencies::find_finalizable_subclass(Klass* k) { | |
1233 if (k->is_interface()) return NULL; | |
1234 if (k->has_finalizer()) return k; | |
1235 k = k->subklass(); | |
1236 while (k != NULL) { | |
1237 Klass* result = find_finalizable_subclass(k); | |
1238 if (result != NULL) return result; | |
1239 k = k->next_sibling(); | |
1240 } | |
1241 return NULL; | |
1242 } | |
1243 | |
1244 | |
1245 bool Dependencies::is_concrete_klass(ciInstanceKlass* k) { | |
1246 if (k->is_abstract()) return false; | |
4060 | 1247 // We could also return false if k does not yet appear to be |
0 | 1248 // instantiated, if the VM version supports this distinction also. |
1249 //if (k->is_not_instantiated()) return false; | |
1250 return true; | |
1251 } | |
1252 | |
1253 bool Dependencies::is_concrete_method(ciMethod* m) { | |
1254 // Statics are irrelevant to virtual call sites. | |
1255 if (m->is_static()) return false; | |
1256 | |
4060 | 1257 // We could also return false if m does not yet appear to be |
0 | 1258 // executed, if the VM version supports this distinction also. |
1259 return !m->is_abstract(); | |
1260 } | |
1261 | |
1262 | |
1263 bool Dependencies::has_finalizable_subclass(ciInstanceKlass* k) { | |
1264 return k->has_finalizable_subclass(); | |
1265 } | |
1266 | |
1267 | |
1268 // Any use of the contents (bytecodes) of a method must be | |
1269 // marked by an "evol_method" dependency, if those contents | |
1270 // can change. (Note: A method is always dependent on itself.) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1271 Klass* Dependencies::check_evol_method(Method* m) { |
0 | 1272 assert(must_be_in_vm(), "raw oops here"); |
1273 // Did somebody do a JVMTI RedefineClasses while our backs were turned? | |
1274 // Or is there a now a breakpoint? | |
1275 // (Assumes compiled code cannot handle bkpts; change if UseFastBreakpoints.) | |
1276 if (m->is_old() | |
1277 || m->number_of_breakpoints() > 0) { | |
1278 return m->method_holder(); | |
1279 } else { | |
1280 return NULL; | |
1281 } | |
1282 } | |
1283 | |
1284 // This is a strong assertion: It is that the given type | |
1285 // has no subtypes whatever. It is most useful for | |
1286 // optimizing checks on reflected types or on array types. | |
1287 // (Checks on types which are derived from real instances | |
1288 // can be optimized more strongly than this, because we | |
1289 // know that the checked type comes from a concrete type, | |
1290 // and therefore we can disregard abstract types.) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1291 Klass* Dependencies::check_leaf_type(Klass* ctxk) { |
0 | 1292 assert(must_be_in_vm(), "raw oops here"); |
1293 assert_locked_or_safepoint(Compile_lock); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1294 InstanceKlass* ctx = InstanceKlass::cast(ctxk); |
0 | 1295 Klass* sub = ctx->subklass(); |
1296 if (sub != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1297 return sub; |
0 | 1298 } else if (ctx->nof_implementors() != 0) { |
1299 // if it is an interface, it must be unimplemented | |
1300 // (if it is not an interface, nof_implementors is always zero) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1301 Klass* impl = ctx->implementor(); |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1302 assert(impl != NULL, "must be set"); |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1303 return impl; |
0 | 1304 } else { |
1305 return NULL; | |
1306 } | |
1307 } | |
1308 | |
1309 // Test the assertion that conck is the only concrete subtype* of ctxk. | |
1310 // The type conck itself is allowed to have have further concrete subtypes. | |
1311 // This allows the compiler to narrow occurrences of ctxk by conck, | |
1312 // when dealing with the types of actual instances. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1313 Klass* Dependencies::check_abstract_with_unique_concrete_subtype(Klass* ctxk, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1314 Klass* conck, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1315 KlassDepChange* changes) { |
0 | 1316 ClassHierarchyWalker wf(conck); |
1317 return wf.find_witness_subtype(ctxk, changes); | |
1318 } | |
1319 | |
1320 // If a non-concrete class has no concrete subtypes, it is not (yet) | |
1321 // instantiatable. This can allow the compiler to make some paths go | |
1322 // dead, if they are gated by a test of the type. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1323 Klass* Dependencies::check_abstract_with_no_concrete_subtype(Klass* ctxk, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1324 KlassDepChange* changes) { |
0 | 1325 // Find any concrete subtype, with no participants: |
1326 ClassHierarchyWalker wf; | |
1327 return wf.find_witness_subtype(ctxk, changes); | |
1328 } | |
1329 | |
1330 | |
1331 // If a concrete class has no concrete subtypes, it can always be | |
1332 // exactly typed. This allows the use of a cheaper type test. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1333 Klass* Dependencies::check_concrete_with_no_concrete_subtype(Klass* ctxk, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1334 KlassDepChange* changes) { |
0 | 1335 // Find any concrete subtype, with only the ctxk as participant: |
1336 ClassHierarchyWalker wf(ctxk); | |
1337 return wf.find_witness_subtype(ctxk, changes); | |
1338 } | |
1339 | |
1340 | |
1341 // Find the unique concrete proper subtype of ctxk, or NULL if there | |
1342 // is more than one concrete proper subtype. If there are no concrete | |
1343 // proper subtypes, return ctxk itself, whether it is concrete or not. | |
1344 // The returned subtype is allowed to have have further concrete subtypes. | |
1345 // That is, return CC1 for CX > CC1 > CC2, but NULL for CX > { CC1, CC2 }. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1346 Klass* Dependencies::find_unique_concrete_subtype(Klass* ctxk) { |
0 | 1347 ClassHierarchyWalker wf(ctxk); // Ignore ctxk when walking. |
1348 wf.record_witnesses(1); // Record one other witness when walking. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1349 Klass* wit = wf.find_witness_subtype(ctxk); |
0 | 1350 if (wit != NULL) return NULL; // Too many witnesses. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1351 Klass* conck = wf.participant(0); |
0 | 1352 if (conck == NULL) { |
1353 #ifndef PRODUCT | |
1354 // Make sure the dependency mechanism will pass this discovery: | |
1355 if (VerifyDependencies) { | |
1356 // Turn off dependency tracing while actually testing deps. | |
1357 FlagSetting fs(TraceDependencies, false); | |
1358 if (!Dependencies::is_concrete_klass(ctxk)) { | |
1359 guarantee(NULL == | |
1360 (void *)check_abstract_with_no_concrete_subtype(ctxk), | |
1361 "verify dep."); | |
1362 } else { | |
1363 guarantee(NULL == | |
1364 (void *)check_concrete_with_no_concrete_subtype(ctxk), | |
1365 "verify dep."); | |
1366 } | |
1367 } | |
1368 #endif //PRODUCT | |
1369 return ctxk; // Return ctxk as a flag for "no subtypes". | |
1370 } else { | |
1371 #ifndef PRODUCT | |
1372 // Make sure the dependency mechanism will pass this discovery: | |
1373 if (VerifyDependencies) { | |
1374 // Turn off dependency tracing while actually testing deps. | |
1375 FlagSetting fs(TraceDependencies, false); | |
1376 if (!Dependencies::is_concrete_klass(ctxk)) { | |
1377 guarantee(NULL == (void *) | |
1378 check_abstract_with_unique_concrete_subtype(ctxk, conck), | |
1379 "verify dep."); | |
1380 } | |
1381 } | |
1382 #endif //PRODUCT | |
1383 return conck; | |
1384 } | |
1385 } | |
1386 | |
1387 // Test the assertion that the k[12] are the only concrete subtypes of ctxk, | |
1388 // except possibly for further subtypes of k[12] themselves. | |
1389 // The context type must be abstract. The types k1 and k2 are themselves | |
1390 // allowed to have further concrete subtypes. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1391 Klass* Dependencies::check_abstract_with_exclusive_concrete_subtypes( |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1392 Klass* ctxk, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1393 Klass* k1, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1394 Klass* k2, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1395 KlassDepChange* changes) { |
0 | 1396 ClassHierarchyWalker wf; |
1397 wf.add_participant(k1); | |
1398 wf.add_participant(k2); | |
1399 return wf.find_witness_subtype(ctxk, changes); | |
1400 } | |
1401 | |
1402 // Search ctxk for concrete implementations. If there are klen or fewer, | |
1403 // pack them into the given array and return the number. | |
1404 // Otherwise, return -1, meaning the given array would overflow. | |
1405 // (Note that a return of 0 means there are exactly no concrete subtypes.) | |
1406 // In this search, if ctxk is concrete, it will be reported alone. | |
1407 // For any type CC reported, no proper subtypes of CC will be reported. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1408 int Dependencies::find_exclusive_concrete_subtypes(Klass* ctxk, |
0 | 1409 int klen, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1410 Klass* karray[]) { |
0 | 1411 ClassHierarchyWalker wf; |
1412 wf.record_witnesses(klen); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1413 Klass* wit = wf.find_witness_subtype(ctxk); |
0 | 1414 if (wit != NULL) return -1; // Too many witnesses. |
1415 int num = wf.num_participants(); | |
1416 assert(num <= klen, "oob"); | |
1417 // Pack the result array with the good news. | |
1418 for (int i = 0; i < num; i++) | |
1419 karray[i] = wf.participant(i); | |
1420 #ifndef PRODUCT | |
1421 // Make sure the dependency mechanism will pass this discovery: | |
1422 if (VerifyDependencies) { | |
1423 // Turn off dependency tracing while actually testing deps. | |
1424 FlagSetting fs(TraceDependencies, false); | |
1425 switch (Dependencies::is_concrete_klass(ctxk)? -1: num) { | |
1426 case -1: // ctxk was itself concrete | |
1427 guarantee(num == 1 && karray[0] == ctxk, "verify dep."); | |
1428 break; | |
1429 case 0: | |
1430 guarantee(NULL == (void *)check_abstract_with_no_concrete_subtype(ctxk), | |
1431 "verify dep."); | |
1432 break; | |
1433 case 1: | |
1434 guarantee(NULL == (void *) | |
1435 check_abstract_with_unique_concrete_subtype(ctxk, karray[0]), | |
1436 "verify dep."); | |
1437 break; | |
1438 case 2: | |
1439 guarantee(NULL == (void *) | |
1440 check_abstract_with_exclusive_concrete_subtypes(ctxk, | |
1441 karray[0], | |
1442 karray[1]), | |
1443 "verify dep."); | |
1444 break; | |
1445 default: | |
1446 ShouldNotReachHere(); // klen > 2 yet supported | |
1447 } | |
1448 } | |
1449 #endif //PRODUCT | |
1450 return num; | |
1451 } | |
1452 | |
1453 // If a class (or interface) has a unique concrete method uniqm, return NULL. | |
1454 // Otherwise, return a class that contains an interfering method. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1455 Klass* Dependencies::check_unique_concrete_method(Klass* ctxk, Method* uniqm, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1456 KlassDepChange* changes) { |
0 | 1457 // Here is a missing optimization: If uniqm->is_final(), |
1458 // we don't really need to search beneath it for overrides. | |
1459 // This is probably not important, since we don't use dependencies | |
1460 // to track final methods. (They can't be "definalized".) | |
1461 ClassHierarchyWalker wf(uniqm->method_holder(), uniqm); | |
1462 return wf.find_witness_definer(ctxk, changes); | |
1463 } | |
1464 | |
1465 // Find the set of all non-abstract methods under ctxk that match m. | |
1466 // (The method m must be defined or inherited in ctxk.) | |
1467 // Include m itself in the set, unless it is abstract. | |
1468 // If this set has exactly one element, return that element. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1469 Method* Dependencies::find_unique_concrete_method(Klass* ctxk, Method* m) { |
0 | 1470 ClassHierarchyWalker wf(m); |
1471 assert(wf.check_method_context(ctxk, m), "proper context"); | |
1472 wf.record_witnesses(1); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1473 Klass* wit = wf.find_witness_definer(ctxk); |
0 | 1474 if (wit != NULL) return NULL; // Too many witnesses. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1475 Method* fm = wf.found_method(0); // Will be NULL if num_parts == 0. |
0 | 1476 if (Dependencies::is_concrete_method(m)) { |
1477 if (fm == NULL) { | |
1478 // It turns out that m was always the only implementation. | |
1479 fm = m; | |
1480 } else if (fm != m) { | |
1481 // Two conflicting implementations after all. | |
1482 // (This can happen if m is inherited into ctxk and fm overrides it.) | |
1483 return NULL; | |
1484 } | |
1485 } | |
1486 #ifndef PRODUCT | |
1487 // Make sure the dependency mechanism will pass this discovery: | |
1488 if (VerifyDependencies && fm != NULL) { | |
1489 guarantee(NULL == (void *)check_unique_concrete_method(ctxk, fm), | |
1490 "verify dep."); | |
1491 } | |
1492 #endif //PRODUCT | |
1493 return fm; | |
1494 } | |
1495 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1496 Klass* Dependencies::check_exclusive_concrete_methods(Klass* ctxk, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1497 Method* m1, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1498 Method* m2, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1499 KlassDepChange* changes) { |
0 | 1500 ClassHierarchyWalker wf(m1); |
1501 wf.add_participant(m1->method_holder()); | |
1502 wf.add_participant(m2->method_holder()); | |
1503 return wf.find_witness_definer(ctxk, changes); | |
1504 } | |
1505 | |
1506 // Find the set of all non-abstract methods under ctxk that match m[0]. | |
1507 // (The method m[0] must be defined or inherited in ctxk.) | |
1508 // Include m itself in the set, unless it is abstract. | |
1509 // Fill the given array m[0..(mlen-1)] with this set, and return the length. | |
1510 // (The length may be zero if no concrete methods are found anywhere.) | |
1511 // If there are too many concrete methods to fit in marray, return -1. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1512 int Dependencies::find_exclusive_concrete_methods(Klass* ctxk, |
0 | 1513 int mlen, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1514 Method* marray[]) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1515 Method* m0 = marray[0]; |
0 | 1516 ClassHierarchyWalker wf(m0); |
1517 assert(wf.check_method_context(ctxk, m0), "proper context"); | |
1518 wf.record_witnesses(mlen); | |
1519 bool participants_hide_witnesses = true; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1520 Klass* wit = wf.find_witness_definer(ctxk); |
0 | 1521 if (wit != NULL) return -1; // Too many witnesses. |
1522 int num = wf.num_participants(); | |
1523 assert(num <= mlen, "oob"); | |
1524 // Keep track of whether m is also part of the result set. | |
1525 int mfill = 0; | |
1526 assert(marray[mfill] == m0, "sanity"); | |
1527 if (Dependencies::is_concrete_method(m0)) | |
1528 mfill++; // keep m0 as marray[0], the first result | |
1529 for (int i = 0; i < num; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1530 Method* fm = wf.found_method(i); |
0 | 1531 if (fm == m0) continue; // Already put this guy in the list. |
1532 if (mfill == mlen) { | |
1533 return -1; // Oops. Too many methods after all! | |
1534 } | |
1535 marray[mfill++] = fm; | |
1536 } | |
1537 #ifndef PRODUCT | |
1538 // Make sure the dependency mechanism will pass this discovery: | |
1539 if (VerifyDependencies) { | |
1540 // Turn off dependency tracing while actually testing deps. | |
1541 FlagSetting fs(TraceDependencies, false); | |
1542 switch (mfill) { | |
1543 case 1: | |
1544 guarantee(NULL == (void *)check_unique_concrete_method(ctxk, marray[0]), | |
1545 "verify dep."); | |
1546 break; | |
1547 case 2: | |
1548 guarantee(NULL == (void *) | |
1549 check_exclusive_concrete_methods(ctxk, marray[0], marray[1]), | |
1550 "verify dep."); | |
1551 break; | |
1552 default: | |
1553 ShouldNotReachHere(); // mlen > 2 yet supported | |
1554 } | |
1555 } | |
1556 #endif //PRODUCT | |
1557 return mfill; | |
1558 } | |
1559 | |
1560 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1561 Klass* Dependencies::check_has_no_finalizable_subclasses(Klass* ctxk, KlassDepChange* changes) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1562 Klass* search_at = ctxk; |
0 | 1563 if (changes != NULL) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1564 search_at = changes->new_type(); // just look at the new bit |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1565 return find_finalizable_subclass(search_at); |
0 | 1566 } |
1567 | |
1568 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1569 Klass* Dependencies::check_call_site_target_value(oop call_site, oop method_handle, CallSiteDepChange* changes) { |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1570 assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "sanity"); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1571 assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "sanity"); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1572 if (changes == NULL) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1573 // Validate all CallSites |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1574 if (java_lang_invoke_CallSite::target(call_site) != method_handle) |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
1575 return call_site->klass(); // assertion failed |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1576 } else { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1577 // Validate the given CallSite |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1578 if (call_site == changes->call_site() && java_lang_invoke_CallSite::target(call_site) != changes->method_handle()) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1579 assert(method_handle != changes->method_handle(), "must be"); |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
1580 return call_site->klass(); // assertion failed |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1581 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1582 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1583 return NULL; // assertion still valid |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1584 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1585 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1586 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1587 void Dependencies::DepStream::trace_and_log_witness(Klass* witness) { |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1588 if (witness != NULL) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1589 if (TraceDependencies) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1590 print_dependency(witness, /*verbose=*/ true); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1591 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1592 // The following is a no-op unless logging is enabled: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1593 log_dependency(witness); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1594 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1595 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1596 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1597 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1598 Klass* Dependencies::DepStream::check_klass_dependency(KlassDepChange* changes) { |
0 | 1599 assert_locked_or_safepoint(Compile_lock); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1600 Dependencies::check_valid_dependency_type(type()); |
0 | 1601 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1602 Klass* witness = NULL; |
0 | 1603 switch (type()) { |
1604 case evol_method: | |
1605 witness = check_evol_method(method_argument(0)); | |
1606 break; | |
1607 case leaf_type: | |
1608 witness = check_leaf_type(context_type()); | |
1609 break; | |
1610 case abstract_with_unique_concrete_subtype: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1611 witness = check_abstract_with_unique_concrete_subtype(context_type(), type_argument(1), changes); |
0 | 1612 break; |
1613 case abstract_with_no_concrete_subtype: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1614 witness = check_abstract_with_no_concrete_subtype(context_type(), changes); |
0 | 1615 break; |
1616 case concrete_with_no_concrete_subtype: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1617 witness = check_concrete_with_no_concrete_subtype(context_type(), changes); |
0 | 1618 break; |
1619 case unique_concrete_method: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1620 witness = check_unique_concrete_method(context_type(), method_argument(1), changes); |
0 | 1621 break; |
1622 case abstract_with_exclusive_concrete_subtypes_2: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1623 witness = check_abstract_with_exclusive_concrete_subtypes(context_type(), type_argument(1), type_argument(2), changes); |
0 | 1624 break; |
1625 case exclusive_concrete_methods_2: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1626 witness = check_exclusive_concrete_methods(context_type(), method_argument(1), method_argument(2), changes); |
0 | 1627 break; |
1628 case no_finalizable_subclasses: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1629 witness = check_has_no_finalizable_subclasses(context_type(), changes); |
0 | 1630 break; |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1631 default: |
0 | 1632 witness = NULL; |
1633 break; | |
1634 } | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1635 trace_and_log_witness(witness); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1636 return witness; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1637 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1638 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1639 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1640 Klass* Dependencies::DepStream::check_call_site_dependency(CallSiteDepChange* changes) { |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1641 assert_locked_or_safepoint(Compile_lock); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1642 Dependencies::check_valid_dependency_type(type()); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1643 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1644 Klass* witness = NULL; |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1645 switch (type()) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1646 case call_site_target_value: |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1647 witness = check_call_site_target_value(argument_oop(0), argument_oop(1), changes); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1648 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1649 default: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1650 witness = NULL; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1651 break; |
0 | 1652 } |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1653 trace_and_log_witness(witness); |
0 | 1654 return witness; |
1655 } | |
1656 | |
1657 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1658 Klass* Dependencies::DepStream::spot_check_dependency_at(DepChange& changes) { |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1659 // Handle klass dependency |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1660 if (changes.is_klass_change() && changes.as_klass_change()->involves_context(context_type())) |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1661 return check_klass_dependency(changes.as_klass_change()); |
0 | 1662 |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1663 // Handle CallSite dependency |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1664 if (changes.is_call_site_change()) |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1665 return check_call_site_dependency(changes.as_call_site_change()); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1666 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1667 // irrelevant dependency; skip it |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1668 return NULL; |
0 | 1669 } |
1670 | |
1671 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1672 void DepChange::print() { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1673 int nsup = 0, nint = 0; |
0 | 1674 for (ContextStream str(*this); str.next(); ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1675 Klass* k = str.klass(); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1676 switch (str.change_type()) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1677 case Change_new_type: |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1678 tty->print_cr(" dependee = %s", InstanceKlass::cast(k)->external_name()); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1679 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1680 case Change_new_sub: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1681 if (!WizardMode) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1682 ++nsup; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1683 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1684 tty->print_cr(" context super = %s", InstanceKlass::cast(k)->external_name()); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1685 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1686 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1687 case Change_new_impl: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1688 if (!WizardMode) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1689 ++nint; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1690 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1691 tty->print_cr(" context interface = %s", InstanceKlass::cast(k)->external_name()); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1692 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1693 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1694 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1695 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1696 if (nsup + nint != 0) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1697 tty->print_cr(" context supers = %d, interfaces = %d", nsup, nint); |
0 | 1698 } |
1699 } | |
1700 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1701 void DepChange::ContextStream::start() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1702 Klass* new_type = _changes.is_klass_change() ? _changes.as_klass_change()->new_type() : (Klass*) NULL; |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1703 _change_type = (new_type == NULL ? NO_CHANGE : Start_Klass); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1704 _klass = new_type; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1705 _ti_base = NULL; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1706 _ti_index = 0; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1707 _ti_limit = 0; |
0 | 1708 } |
1709 | |
1710 bool DepChange::ContextStream::next() { | |
1711 switch (_change_type) { | |
1712 case Start_Klass: // initial state; _klass is the new type | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1713 _ti_base = InstanceKlass::cast(_klass)->transitive_interfaces(); |
0 | 1714 _ti_index = 0; |
1715 _change_type = Change_new_type; | |
1716 return true; | |
1717 case Change_new_type: | |
1718 // fall through: | |
1719 _change_type = Change_new_sub; | |
1720 case Change_new_sub: | |
54
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1721 // 6598190: brackets workaround Sun Studio C++ compiler bug 6629277 |
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1722 { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1723 _klass = InstanceKlass::cast(_klass)->super(); |
54
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1724 if (_klass != NULL) { |
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1725 return true; |
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1726 } |
0 | 1727 } |
1728 // else set up _ti_limit and fall through: | |
1729 _ti_limit = (_ti_base == NULL) ? 0 : _ti_base->length(); | |
1730 _change_type = Change_new_impl; | |
1731 case Change_new_impl: | |
1732 if (_ti_index < _ti_limit) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1733 _klass = _ti_base->at(_ti_index++); |
0 | 1734 return true; |
1735 } | |
1736 // fall through: | |
1737 _change_type = NO_CHANGE; // iterator is exhausted | |
1738 case NO_CHANGE: | |
1739 break; | |
1740 default: | |
1741 ShouldNotReachHere(); | |
1742 } | |
1743 return false; | |
1744 } | |
1745 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1746 void KlassDepChange::initialize() { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1747 // entire transaction must be under this lock: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1748 assert_lock_strong(Compile_lock); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1749 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1750 // Mark all dependee and all its superclasses |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1751 // Mark transitive interfaces |
0 | 1752 for (ContextStream str(*this); str.next(); ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1753 Klass* d = str.klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1754 assert(!InstanceKlass::cast(d)->is_marked_dependent(), "checking"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1755 InstanceKlass::cast(d)->set_is_marked_dependent(true); |
0 | 1756 } |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1757 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1758 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1759 KlassDepChange::~KlassDepChange() { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1760 // Unmark all dependee and all its superclasses |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1761 // Unmark transitive interfaces |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1762 for (ContextStream str(*this); str.next(); ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1763 Klass* d = str.klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1764 InstanceKlass::cast(d)->set_is_marked_dependent(false); |
0 | 1765 } |
1766 } | |
1767 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1768 bool KlassDepChange::involves_context(Klass* k) { |
6983 | 1769 if (k == NULL || !k->oop_is_instance()) { |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1770 return false; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1771 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1772 InstanceKlass* ik = InstanceKlass::cast(k); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1773 bool is_contained = ik->is_marked_dependent(); |
6983 | 1774 assert(is_contained == new_type()->is_subtype_of(k), |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1775 "correct marking of potential context types"); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1776 return is_contained; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1777 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1778 |
0 | 1779 #ifndef PRODUCT |
1780 void Dependencies::print_statistics() { | |
1781 if (deps_find_witness_print != 0) { | |
1782 // Call one final time, to flush out the data. | |
1783 deps_find_witness_print = -1; | |
1784 count_find_witness_calls(); | |
1785 } | |
1786 } | |
1787 #endif |