Mercurial > hg > graal-jvmci-8
annotate src/share/vm/code/dependencies.cpp @ 14262:3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
Summary: Avoid verifying dependencies multiple times by caching verified dependencies
Reviewed-by: kvn, twisti, roland
author | anoll |
---|---|
date | Wed, 15 Jan 2014 06:16:55 +0100 |
parents | ac9cb1d5a202 |
children | 3e2b76368121 757ec609d8d5 |
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 } |
11034 | 658 assert(o == NULL || o->is_metaspace_object(), |
659 err_msg("Should be metadata " PTR_FORMAT, o)); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
660 return o; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
661 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
662 |
0 | 663 inline oop Dependencies::DepStream::recorded_oop_at(int i) { |
664 return (_code != NULL) | |
665 ? _code->oop_at(i) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
666 : JNIHandles::resolve(_deps->oop_recorder()->oop_at(i)); |
0 | 667 } |
668 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
669 Metadata* Dependencies::DepStream::argument(int i) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
670 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
|
671 |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
672 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
|
673 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
|
674 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
|
675 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
|
676 } |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
677 } |
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
678 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
679 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
|
680 return result; |
0 | 681 } |
682 | |
14262
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 * 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
|
685 */ |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
686 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
|
687 if (has_oop_argument()) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
688 return (uintptr_t)(oopDesc*)argument_oop(i); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
689 } else { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
690 return (uintptr_t)argument(i); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
691 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
692 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
693 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
694 oop Dependencies::DepStream::argument_oop(int i) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
695 oop result = recorded_oop_at(argument_index(i)); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
696 assert(result == NULL || result->is_oop(), "must be"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
697 return result; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
698 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
699 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
700 Klass* Dependencies::DepStream::context_type() { |
0 | 701 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
|
702 |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
703 // 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
|
704 { |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
705 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
|
706 if (ctxkj >= 0) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
707 Metadata* k = argument(ctxkj); |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
708 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
|
709 return (Klass*)k; |
3894
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 } |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
712 |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
713 // 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
|
714 // 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
|
715 { |
6844
9a9b6e05ffb4
8000232: NPG: SIGSEGV in Dependencies::DepStream::check_klass_dependency on solaris-x64
vlivanov
parents:
6740
diff
changeset
|
716 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
|
717 if (ctxkj >= 0) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
718 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
|
719 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
|
720 return (Klass*) k; |
0 | 721 } |
722 } | |
3894
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
723 |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
724 // 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
|
725 // e.g. evol_method. |
b27c72d69fd1
7083184: JSR 292: don't store context class argument with call site dependencies
twisti
parents:
3852
diff
changeset
|
726 return NULL; |
0 | 727 } |
728 | |
14262
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
729 // ----------------- DependencySignature -------------------------------------- |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
730 bool DependencySignature::equals(const DependencySignature& sig) const { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
731 if (type() != sig.type()) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
732 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
733 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
734 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
735 if (args_count() != sig.args_count()) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
736 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
737 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
738 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
739 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
|
740 if (arg(i) != sig.arg(i)) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
741 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
742 } |
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 return true; |
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 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
747 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
748 // ----------------- DependencySignatureBuffer -------------------------------------- |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
749 DependencySignatureBuffer::DependencySignatureBuffer() { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
750 _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
|
751 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
|
752 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
753 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
754 /* 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
|
755 * 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
|
756 * 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
|
757 * 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
|
758 * 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
|
759 */ |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
760 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
|
761 const int index = sig.type(); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
762 GrowableArray<DependencySignature*>* buffer = _signatures[index]; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
763 if (buffer == NULL) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
764 buffer = new GrowableArray<DependencySignature*>(); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
765 _signatures[index] = buffer; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
766 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
767 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
768 // 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
|
769 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
|
770 DependencySignature* checked_signature = buffer->at(i); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
771 if (checked_signature->equals(sig)) { |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
772 return true; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
773 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
774 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
775 buffer->append((DependencySignature*)&sig); |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
776 return false; |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
777 } |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
778 |
3aaa4b9966f6
7194669: CodeCache::mark_for_deoptimization should avoid verifying dependencies multiple times
anoll
parents:
12823
diff
changeset
|
779 |
0 | 780 /// Checking dependencies: |
781 | |
782 // This hierarchy walker inspects subtypes of a given type, | |
783 // trying to find a "bad" class which breaks a dependency. | |
784 // Such a class is called a "witness" to the broken dependency. | |
785 // While searching around, we ignore "participants", which | |
786 // are already known to the dependency. | |
787 class ClassHierarchyWalker { | |
788 public: | |
789 enum { PARTICIPANT_LIMIT = 3 }; | |
790 | |
791 private: | |
792 // optional method descriptor to check for: | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
793 Symbol* _name; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1972
diff
changeset
|
794 Symbol* _signature; |
0 | 795 |
796 // 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
|
797 Klass* _participants[PARTICIPANT_LIMIT+1]; |
0 | 798 int _num_participants; |
799 | |
800 // cache of method lookups | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
801 Method* _found_methods[PARTICIPANT_LIMIT+1]; |
0 | 802 |
803 // if non-zero, tells how many witnesses to convert to participants | |
804 int _record_witnesses; | |
805 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
806 void initialize(Klass* participant) { |
0 | 807 _record_witnesses = 0; |
808 _participants[0] = participant; | |
809 _found_methods[0] = NULL; | |
810 _num_participants = 0; | |
811 if (participant != NULL) { | |
812 // Terminating NULL. | |
813 _participants[1] = NULL; | |
814 _found_methods[1] = NULL; | |
815 _num_participants = 1; | |
816 } | |
817 } | |
818 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
819 void initialize_from_method(Method* m) { |
0 | 820 assert(m != NULL && m->is_method(), "sanity"); |
821 _name = m->name(); | |
822 _signature = m->signature(); | |
823 } | |
824 | |
825 public: | |
826 // The walker is initialized to recognize certain methods and/or types | |
827 // as friendly participants. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
828 ClassHierarchyWalker(Klass* participant, Method* m) { |
0 | 829 initialize_from_method(m); |
830 initialize(participant); | |
831 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
832 ClassHierarchyWalker(Method* m) { |
0 | 833 initialize_from_method(m); |
834 initialize(NULL); | |
835 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
836 ClassHierarchyWalker(Klass* participant = NULL) { |
0 | 837 _name = NULL; |
838 _signature = NULL; | |
839 initialize(participant); | |
840 } | |
841 | |
842 // This is common code for two searches: One for concrete subtypes, | |
843 // the other for concrete method implementations and overrides. | |
844 bool doing_subtype_search() { | |
845 return _name == NULL; | |
846 } | |
847 | |
848 int num_participants() { return _num_participants; } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
849 Klass* participant(int n) { |
0 | 850 assert((uint)n <= (uint)_num_participants, "oob"); |
851 return _participants[n]; | |
852 } | |
853 | |
854 // Note: If n==num_participants, returns NULL. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
855 Method* found_method(int n) { |
0 | 856 assert((uint)n <= (uint)_num_participants, "oob"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
857 Method* fm = _found_methods[n]; |
0 | 858 assert(n == _num_participants || fm != NULL, "proper usage"); |
859 assert(fm == NULL || fm->method_holder() == _participants[n], "sanity"); | |
860 return fm; | |
861 } | |
862 | |
863 #ifdef ASSERT | |
864 // Assert that m is inherited into ctxk, without intervening overrides. | |
865 // (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
|
866 bool check_method_context(Klass* ctxk, Method* m) { |
0 | 867 if (m->method_holder() == ctxk) |
868 return true; // Quick win. | |
869 if (m->is_private()) | |
870 return false; // Quick lose. Should not happen. | |
871 if (!(m->is_public() || m->is_protected())) | |
872 // The override story is complex when packages get involved. | |
873 return true; // Must punt the assertion to true. | |
6983 | 874 Klass* k = ctxk; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
875 Method* lm = k->lookup_method(m->name(), m->signature()); |
0 | 876 if (lm == NULL && k->oop_is_instance()) { |
12823
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
11034
diff
changeset
|
877 // It might be an interface method |
ac9cb1d5a202
8009130: Lambda: Fix access controls, loader constraints.
acorn
parents:
11034
diff
changeset
|
878 lm = ((InstanceKlass*)k)->lookup_method_in_ordered_interfaces(m->name(), |
0 | 879 m->signature()); |
880 } | |
881 if (lm == m) | |
882 // Method m is inherited into ctxk. | |
883 return true; | |
884 if (lm != NULL) { | |
4060 | 885 if (!(lm->is_public() || lm->is_protected())) { |
0 | 886 // Method is [package-]private, so the override story is complex. |
887 return true; // Must punt the assertion to true. | |
4060 | 888 } |
889 if (lm->is_static()) { | |
890 // Static methods don't override non-static so punt | |
891 return true; | |
892 } | |
0 | 893 if ( !Dependencies::is_concrete_method(lm) |
894 && !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
|
895 && lm->method_holder()->is_subtype_of(m->method_holder())) |
0 | 896 // Method m is overridden by lm, but both are non-concrete. |
897 return true; | |
898 } | |
899 ResourceMark rm; | |
900 tty->print_cr("Dependency method not found in the associated context:"); | |
6983 | 901 tty->print_cr(" context = %s", ctxk->external_name()); |
0 | 902 tty->print( " method = "); m->print_short_name(tty); tty->cr(); |
903 if (lm != NULL) { | |
904 tty->print( " found = "); lm->print_short_name(tty); tty->cr(); | |
905 } | |
906 return false; | |
907 } | |
908 #endif | |
909 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
910 void add_participant(Klass* participant) { |
0 | 911 assert(_num_participants + _record_witnesses < PARTICIPANT_LIMIT, "oob"); |
912 int np = _num_participants++; | |
913 _participants[np] = participant; | |
914 _participants[np+1] = NULL; | |
915 _found_methods[np+1] = NULL; | |
916 } | |
917 | |
918 void record_witnesses(int add) { | |
919 if (add > PARTICIPANT_LIMIT) add = PARTICIPANT_LIMIT; | |
920 assert(_num_participants + add < PARTICIPANT_LIMIT, "oob"); | |
921 _record_witnesses = add; | |
922 } | |
923 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
924 bool is_witness(Klass* k) { |
0 | 925 if (doing_subtype_search()) { |
926 return Dependencies::is_concrete_klass(k); | |
927 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
928 Method* m = InstanceKlass::cast(k)->find_method(_name, _signature); |
0 | 929 if (m == NULL || !Dependencies::is_concrete_method(m)) return false; |
930 _found_methods[_num_participants] = m; | |
931 // Note: If add_participant(k) is called, | |
932 // the method m will already be memoized for it. | |
933 return true; | |
934 } | |
935 } | |
936 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
937 bool is_participant(Klass* k) { |
0 | 938 if (k == _participants[0]) { |
939 return true; | |
940 } else if (_num_participants <= 1) { | |
941 return false; | |
942 } else { | |
943 return in_list(k, &_participants[1]); | |
944 } | |
945 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
946 bool ignore_witness(Klass* witness) { |
0 | 947 if (_record_witnesses == 0) { |
948 return false; | |
949 } else { | |
950 --_record_witnesses; | |
951 add_participant(witness); | |
952 return true; | |
953 } | |
954 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
955 static bool in_list(Klass* x, Klass** list) { |
0 | 956 for (int i = 0; ; i++) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
957 Klass* y = list[i]; |
0 | 958 if (y == NULL) break; |
959 if (y == x) return true; | |
960 } | |
961 return false; // not in list | |
962 } | |
963 | |
964 private: | |
965 // the actual search method: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
966 Klass* find_witness_anywhere(Klass* context_type, |
0 | 967 bool participants_hide_witnesses, |
968 bool top_level_call = true); | |
969 // the spot-checking version: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
970 Klass* find_witness_in(KlassDepChange& changes, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
971 Klass* context_type, |
0 | 972 bool participants_hide_witnesses); |
973 public: | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
974 Klass* find_witness_subtype(Klass* context_type, KlassDepChange* changes = NULL) { |
0 | 975 assert(doing_subtype_search(), "must set up a subtype search"); |
976 // When looking for unexpected concrete types, | |
977 // do not look beneath expected ones. | |
978 const bool participants_hide_witnesses = true; | |
979 // CX > CC > C' is OK, even if C' is new. | |
980 // CX > { CC, C' } is not OK if C' is new, and C' is the witness. | |
981 if (changes != NULL) { | |
982 return find_witness_in(*changes, context_type, participants_hide_witnesses); | |
983 } else { | |
984 return find_witness_anywhere(context_type, participants_hide_witnesses); | |
985 } | |
986 } | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
987 Klass* find_witness_definer(Klass* context_type, KlassDepChange* changes = NULL) { |
0 | 988 assert(!doing_subtype_search(), "must set up a method definer search"); |
989 // When looking for unexpected concrete methods, | |
990 // look beneath expected ones, to see if there are overrides. | |
991 const bool participants_hide_witnesses = true; | |
992 // CX.m > CC.m > C'.m is not OK, if C'.m is new, and C' is the witness. | |
993 if (changes != NULL) { | |
994 return find_witness_in(*changes, context_type, !participants_hide_witnesses); | |
995 } else { | |
996 return find_witness_anywhere(context_type, !participants_hide_witnesses); | |
997 } | |
998 } | |
999 }; | |
1000 | |
1001 #ifndef PRODUCT | |
1002 static int deps_find_witness_calls = 0; | |
1003 static int deps_find_witness_steps = 0; | |
1004 static int deps_find_witness_recursions = 0; | |
1005 static int deps_find_witness_singles = 0; | |
1006 static int deps_find_witness_print = 0; // set to -1 to force a final print | |
1007 static bool count_find_witness_calls() { | |
1008 if (TraceDependencies || LogCompilation) { | |
1009 int pcount = deps_find_witness_print + 1; | |
1010 bool final_stats = (pcount == 0); | |
1011 bool initial_call = (pcount == 1); | |
1012 bool occasional_print = ((pcount & ((1<<10) - 1)) == 0); | |
1013 if (pcount < 0) pcount = 1; // crude overflow protection | |
1014 deps_find_witness_print = pcount; | |
1015 if (VerifyDependencies && initial_call) { | |
1016 tty->print_cr("Warning: TraceDependencies results may be inflated by VerifyDependencies"); | |
1017 } | |
1018 if (occasional_print || final_stats) { | |
1019 // Every now and then dump a little info about dependency searching. | |
1020 if (xtty != NULL) { | |
1206
87684f1a88b5
6614597: Performance variability in jvm2008 xml.validation
kvn
parents:
1123
diff
changeset
|
1021 ttyLocker ttyl; |
87684f1a88b5
6614597: Performance variability in jvm2008 xml.validation
kvn
parents:
1123
diff
changeset
|
1022 xtty->elem("deps_find_witness calls='%d' steps='%d' recursions='%d' singles='%d'", |
0 | 1023 deps_find_witness_calls, |
1024 deps_find_witness_steps, | |
1025 deps_find_witness_recursions, | |
1026 deps_find_witness_singles); | |
1027 } | |
1028 if (final_stats || (TraceDependencies && WizardMode)) { | |
1206
87684f1a88b5
6614597: Performance variability in jvm2008 xml.validation
kvn
parents:
1123
diff
changeset
|
1029 ttyLocker ttyl; |
0 | 1030 tty->print_cr("Dependency check (find_witness) " |
1031 "calls=%d, steps=%d (avg=%.1f), recursions=%d, singles=%d", | |
1032 deps_find_witness_calls, | |
1033 deps_find_witness_steps, | |
1034 (double)deps_find_witness_steps / deps_find_witness_calls, | |
1035 deps_find_witness_recursions, | |
1036 deps_find_witness_singles); | |
1037 } | |
1038 } | |
1039 return true; | |
1040 } | |
1041 return false; | |
1042 } | |
1043 #else | |
1044 #define count_find_witness_calls() (0) | |
1045 #endif //PRODUCT | |
1046 | |
1047 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1048 Klass* ClassHierarchyWalker::find_witness_in(KlassDepChange& changes, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1049 Klass* context_type, |
0 | 1050 bool participants_hide_witnesses) { |
1051 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
|
1052 Klass* new_type = changes.new_type(); |
0 | 1053 |
10973
ef57c43512d6
8014431: cleanup warnings indicated by the -Wunused-value compiler option on linux
ccheung
parents:
6985
diff
changeset
|
1054 (void)count_find_witness_calls(); |
0 | 1055 NOT_PRODUCT(deps_find_witness_singles++); |
1056 | |
1057 // Current thread must be in VM (not native mode, as in CI): | |
1058 assert(must_be_in_vm(), "raw oops here"); | |
1059 // Must not move the class hierarchy during this check: | |
1060 assert_locked_or_safepoint(Compile_lock); | |
1061 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1062 int nof_impls = InstanceKlass::cast(context_type)->nof_implementors(); |
30 | 1063 if (nof_impls > 1) { |
1064 // Avoid this case: *I.m > { A.m, C }; B.m > C | |
1065 // %%% Until this is fixed more systematically, bail out. | |
1066 // See corresponding comment in find_witness_anywhere. | |
1067 return context_type; | |
1068 } | |
1069 | |
0 | 1070 assert(!is_participant(new_type), "only old classes are participants"); |
1071 if (participants_hide_witnesses) { | |
1072 // If the new type is a subtype of a participant, we are done. | |
1073 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
|
1074 Klass* part = participant(i); |
0 | 1075 if (part == NULL) continue; |
6983 | 1076 assert(changes.involves_context(part) == new_type->is_subtype_of(part), |
0 | 1077 "correct marking of participants, b/c new_type is unique"); |
1078 if (changes.involves_context(part)) { | |
1079 // new guy is protected from this check by previous participant | |
1080 return NULL; | |
1081 } | |
1082 } | |
1083 } | |
1084 | |
1085 if (is_witness(new_type) && | |
1086 !ignore_witness(new_type)) { | |
1087 return new_type; | |
1088 } | |
1089 | |
1090 return NULL; | |
1091 } | |
1092 | |
1093 | |
1094 // Walk hierarchy under a context type, looking for unexpected types. | |
1095 // Do not report participant types, and recursively walk beneath | |
1096 // them only if participants_hide_witnesses is false. | |
1097 // If top_level_call is false, skip testing the context type, | |
1098 // because the caller has already considered it. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1099 Klass* ClassHierarchyWalker::find_witness_anywhere(Klass* context_type, |
0 | 1100 bool participants_hide_witnesses, |
1101 bool top_level_call) { | |
1102 // Current thread must be in VM (not native mode, as in CI): | |
1103 assert(must_be_in_vm(), "raw oops here"); | |
1104 // Must not move the class hierarchy during this check: | |
1105 assert_locked_or_safepoint(Compile_lock); | |
1106 | |
1107 bool do_counts = count_find_witness_calls(); | |
1108 | |
1109 // Check the root of the sub-hierarchy first. | |
1110 if (top_level_call) { | |
1111 if (do_counts) { | |
1112 NOT_PRODUCT(deps_find_witness_calls++); | |
1113 NOT_PRODUCT(deps_find_witness_steps++); | |
1114 } | |
1115 if (is_participant(context_type)) { | |
1116 if (participants_hide_witnesses) return NULL; | |
1117 // else fall through to search loop... | |
1118 } else if (is_witness(context_type) && !ignore_witness(context_type)) { | |
1119 // The context is an abstract class or interface, to start with. | |
1120 return context_type; | |
1121 } | |
1122 } | |
1123 | |
1124 // Now we must check each implementor and each subclass. | |
1125 // Use a short worklist to avoid blowing the stack. | |
1126 // 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
|
1127 const int CHAINMAX = 100; // >= 1 + InstanceKlass::implementors_limit |
0 | 1128 Klass* chains[CHAINMAX]; |
1129 int chaini = 0; // index into worklist | |
1130 Klass* chain; // scratch variable | |
1131 #define ADD_SUBCLASS_CHAIN(k) { \ | |
1132 assert(chaini < CHAINMAX, "oob"); \ | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1133 chain = InstanceKlass::cast(k)->subklass(); \ |
0 | 1134 if (chain != NULL) chains[chaini++] = chain; } |
1135 | |
1136 // Look for non-abstract subclasses. | |
1137 // (Note: Interfaces do not have subclasses.) | |
1138 ADD_SUBCLASS_CHAIN(context_type); | |
1139 | |
1140 // If it is an interface, search its direct implementors. | |
1141 // (Their subclasses are additional indirect implementors. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1142 // See InstanceKlass::add_implementor.) |
0 | 1143 // (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
|
1144 int nof_impls = InstanceKlass::cast(context_type)->nof_implementors(); |
0 | 1145 if (nof_impls > 1) { |
1146 // Avoid this case: *I.m > { A.m, C }; B.m > C | |
1147 // Here, I.m has 2 concrete implementations, but m appears unique | |
1148 // as A.m, because the search misses B.m when checking C. | |
1149 // The inherited method B.m was getting missed by the walker | |
1150 // when interface 'I' was the starting point. | |
1151 // %%% Until this is fixed more systematically, bail out. | |
1152 // (Old CHA had the same limitation.) | |
1153 return context_type; | |
1154 } | |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1155 if (nof_impls > 0) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1156 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
|
1157 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
|
1158 // 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
|
1159 // 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
|
1160 if (impl == context_type) { |
0 | 1161 return context_type; // report an inexact witness to this sad affair |
1162 } | |
1163 if (do_counts) | |
1164 { NOT_PRODUCT(deps_find_witness_steps++); } | |
1165 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
|
1166 if (!participants_hide_witnesses) { |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1167 ADD_SUBCLASS_CHAIN(impl); |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1168 } |
0 | 1169 } else if (is_witness(impl) && !ignore_witness(impl)) { |
1170 return impl; | |
5998
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1171 } else { |
49036505ab5f
7154670: The instanceKlass _implementors[] and _nof_implementors are not needed for non-interface klass.
jiangli
parents:
4772
diff
changeset
|
1172 ADD_SUBCLASS_CHAIN(impl); |
0 | 1173 } |
1174 } | |
1175 | |
1176 // Recursively process each non-trivial sibling chain. | |
1177 while (chaini > 0) { | |
1178 Klass* chain = chains[--chaini]; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1179 for (Klass* sub = chain; sub != NULL; sub = sub->next_sibling()) { |
0 | 1180 if (do_counts) { NOT_PRODUCT(deps_find_witness_steps++); } |
1181 if (is_participant(sub)) { | |
1182 if (participants_hide_witnesses) continue; | |
1183 // else fall through to process this guy's subclasses | |
1184 } else if (is_witness(sub) && !ignore_witness(sub)) { | |
1185 return sub; | |
1186 } | |
1187 if (chaini < (VerifyDependencies? 2: CHAINMAX)) { | |
1188 // Fast path. (Partially disabled if VerifyDependencies.) | |
1189 ADD_SUBCLASS_CHAIN(sub); | |
1190 } else { | |
1191 // Worklist overflow. Do a recursive call. Should be rare. | |
1192 // The recursive call will have its own worklist, of course. | |
1193 // (Note that sub has already been tested, so that there is | |
1194 // no need for the recursive call to re-test. That's handy, | |
1195 // since the recursive call sees sub as the context_type.) | |
1196 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
|
1197 Klass* witness = find_witness_anywhere(sub, |
0 | 1198 participants_hide_witnesses, |
1199 /*top_level_call=*/ false); | |
1200 if (witness != NULL) return witness; | |
1201 } | |
1202 } | |
1203 } | |
1204 | |
1205 // No witness found. The dependency remains unbroken. | |
1206 return NULL; | |
1207 #undef ADD_SUBCLASS_CHAIN | |
1208 } | |
1209 | |
1210 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1211 bool Dependencies::is_concrete_klass(Klass* k) { |
6983 | 1212 if (k->is_abstract()) return false; |
0 | 1213 // %%% We could treat classes which are concrete but |
1214 // have not yet been instantiated as virtually abstract. | |
1215 // This would require a deoptimization barrier on first instantiation. | |
1216 //if (k->is_not_instantiated()) return false; | |
1217 return true; | |
1218 } | |
1219 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1220 bool Dependencies::is_concrete_method(Method* m) { |
4060 | 1221 // Statics are irrelevant to virtual call sites. |
1222 if (m->is_static()) return false; | |
1223 | |
1224 // We could also return false if m does not yet appear to be | |
1225 // executed, if the VM version supports this distinction also. | |
6934 | 1226 return !m->is_abstract() && |
1227 !InstanceKlass::cast(m->method_holder())->is_interface(); | |
1228 // TODO: investigate whether default methods should be | |
1229 // considered as "concrete" in this situation. For now they | |
1230 // are not. | |
0 | 1231 } |
1232 | |
1233 | |
1234 Klass* Dependencies::find_finalizable_subclass(Klass* k) { | |
1235 if (k->is_interface()) return NULL; | |
1236 if (k->has_finalizer()) return k; | |
1237 k = k->subklass(); | |
1238 while (k != NULL) { | |
1239 Klass* result = find_finalizable_subclass(k); | |
1240 if (result != NULL) return result; | |
1241 k = k->next_sibling(); | |
1242 } | |
1243 return NULL; | |
1244 } | |
1245 | |
1246 | |
1247 bool Dependencies::is_concrete_klass(ciInstanceKlass* k) { | |
1248 if (k->is_abstract()) return false; | |
4060 | 1249 // We could also return false if k does not yet appear to be |
0 | 1250 // instantiated, if the VM version supports this distinction also. |
1251 //if (k->is_not_instantiated()) return false; | |
1252 return true; | |
1253 } | |
1254 | |
1255 bool Dependencies::is_concrete_method(ciMethod* m) { | |
1256 // Statics are irrelevant to virtual call sites. | |
1257 if (m->is_static()) return false; | |
1258 | |
4060 | 1259 // We could also return false if m does not yet appear to be |
0 | 1260 // executed, if the VM version supports this distinction also. |
1261 return !m->is_abstract(); | |
1262 } | |
1263 | |
1264 | |
1265 bool Dependencies::has_finalizable_subclass(ciInstanceKlass* k) { | |
1266 return k->has_finalizable_subclass(); | |
1267 } | |
1268 | |
1269 | |
1270 // Any use of the contents (bytecodes) of a method must be | |
1271 // marked by an "evol_method" dependency, if those contents | |
1272 // 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
|
1273 Klass* Dependencies::check_evol_method(Method* m) { |
0 | 1274 assert(must_be_in_vm(), "raw oops here"); |
1275 // Did somebody do a JVMTI RedefineClasses while our backs were turned? | |
1276 // Or is there a now a breakpoint? | |
1277 // (Assumes compiled code cannot handle bkpts; change if UseFastBreakpoints.) | |
1278 if (m->is_old() | |
1279 || m->number_of_breakpoints() > 0) { | |
1280 return m->method_holder(); | |
1281 } else { | |
1282 return NULL; | |
1283 } | |
1284 } | |
1285 | |
1286 // This is a strong assertion: It is that the given type | |
1287 // has no subtypes whatever. It is most useful for | |
1288 // optimizing checks on reflected types or on array types. | |
1289 // (Checks on types which are derived from real instances | |
1290 // can be optimized more strongly than this, because we | |
1291 // know that the checked type comes from a concrete type, | |
1292 // and therefore we can disregard abstract types.) | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1293 Klass* Dependencies::check_leaf_type(Klass* ctxk) { |
0 | 1294 assert(must_be_in_vm(), "raw oops here"); |
1295 assert_locked_or_safepoint(Compile_lock); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1296 InstanceKlass* ctx = InstanceKlass::cast(ctxk); |
0 | 1297 Klass* sub = ctx->subklass(); |
1298 if (sub != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1299 return sub; |
0 | 1300 } else if (ctx->nof_implementors() != 0) { |
1301 // if it is an interface, it must be unimplemented | |
1302 // (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
|
1303 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
|
1304 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
|
1305 return impl; |
0 | 1306 } else { |
1307 return NULL; | |
1308 } | |
1309 } | |
1310 | |
1311 // Test the assertion that conck is the only concrete subtype* of ctxk. | |
1312 // The type conck itself is allowed to have have further concrete subtypes. | |
1313 // This allows the compiler to narrow occurrences of ctxk by conck, | |
1314 // 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
|
1315 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
|
1316 Klass* conck, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1317 KlassDepChange* changes) { |
0 | 1318 ClassHierarchyWalker wf(conck); |
1319 return wf.find_witness_subtype(ctxk, changes); | |
1320 } | |
1321 | |
1322 // If a non-concrete class has no concrete subtypes, it is not (yet) | |
1323 // instantiatable. This can allow the compiler to make some paths go | |
1324 // 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
|
1325 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
|
1326 KlassDepChange* changes) { |
0 | 1327 // Find any concrete subtype, with no participants: |
1328 ClassHierarchyWalker wf; | |
1329 return wf.find_witness_subtype(ctxk, changes); | |
1330 } | |
1331 | |
1332 | |
1333 // If a concrete class has no concrete subtypes, it can always be | |
1334 // 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
|
1335 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
|
1336 KlassDepChange* changes) { |
0 | 1337 // Find any concrete subtype, with only the ctxk as participant: |
1338 ClassHierarchyWalker wf(ctxk); | |
1339 return wf.find_witness_subtype(ctxk, changes); | |
1340 } | |
1341 | |
1342 | |
1343 // Find the unique concrete proper subtype of ctxk, or NULL if there | |
1344 // is more than one concrete proper subtype. If there are no concrete | |
1345 // proper subtypes, return ctxk itself, whether it is concrete or not. | |
1346 // The returned subtype is allowed to have have further concrete subtypes. | |
1347 // 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
|
1348 Klass* Dependencies::find_unique_concrete_subtype(Klass* ctxk) { |
0 | 1349 ClassHierarchyWalker wf(ctxk); // Ignore ctxk when walking. |
1350 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
|
1351 Klass* wit = wf.find_witness_subtype(ctxk); |
0 | 1352 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
|
1353 Klass* conck = wf.participant(0); |
0 | 1354 if (conck == NULL) { |
1355 #ifndef PRODUCT | |
1356 // Make sure the dependency mechanism will pass this discovery: | |
1357 if (VerifyDependencies) { | |
1358 // Turn off dependency tracing while actually testing deps. | |
1359 FlagSetting fs(TraceDependencies, false); | |
1360 if (!Dependencies::is_concrete_klass(ctxk)) { | |
1361 guarantee(NULL == | |
1362 (void *)check_abstract_with_no_concrete_subtype(ctxk), | |
1363 "verify dep."); | |
1364 } else { | |
1365 guarantee(NULL == | |
1366 (void *)check_concrete_with_no_concrete_subtype(ctxk), | |
1367 "verify dep."); | |
1368 } | |
1369 } | |
1370 #endif //PRODUCT | |
1371 return ctxk; // Return ctxk as a flag for "no subtypes". | |
1372 } else { | |
1373 #ifndef PRODUCT | |
1374 // Make sure the dependency mechanism will pass this discovery: | |
1375 if (VerifyDependencies) { | |
1376 // Turn off dependency tracing while actually testing deps. | |
1377 FlagSetting fs(TraceDependencies, false); | |
1378 if (!Dependencies::is_concrete_klass(ctxk)) { | |
1379 guarantee(NULL == (void *) | |
1380 check_abstract_with_unique_concrete_subtype(ctxk, conck), | |
1381 "verify dep."); | |
1382 } | |
1383 } | |
1384 #endif //PRODUCT | |
1385 return conck; | |
1386 } | |
1387 } | |
1388 | |
1389 // Test the assertion that the k[12] are the only concrete subtypes of ctxk, | |
1390 // except possibly for further subtypes of k[12] themselves. | |
1391 // The context type must be abstract. The types k1 and k2 are themselves | |
1392 // allowed to have further concrete subtypes. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1393 Klass* Dependencies::check_abstract_with_exclusive_concrete_subtypes( |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1394 Klass* ctxk, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1395 Klass* k1, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1396 Klass* k2, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1397 KlassDepChange* changes) { |
0 | 1398 ClassHierarchyWalker wf; |
1399 wf.add_participant(k1); | |
1400 wf.add_participant(k2); | |
1401 return wf.find_witness_subtype(ctxk, changes); | |
1402 } | |
1403 | |
1404 // Search ctxk for concrete implementations. If there are klen or fewer, | |
1405 // pack them into the given array and return the number. | |
1406 // Otherwise, return -1, meaning the given array would overflow. | |
1407 // (Note that a return of 0 means there are exactly no concrete subtypes.) | |
1408 // In this search, if ctxk is concrete, it will be reported alone. | |
1409 // 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
|
1410 int Dependencies::find_exclusive_concrete_subtypes(Klass* ctxk, |
0 | 1411 int klen, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1412 Klass* karray[]) { |
0 | 1413 ClassHierarchyWalker wf; |
1414 wf.record_witnesses(klen); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1415 Klass* wit = wf.find_witness_subtype(ctxk); |
0 | 1416 if (wit != NULL) return -1; // Too many witnesses. |
1417 int num = wf.num_participants(); | |
1418 assert(num <= klen, "oob"); | |
1419 // Pack the result array with the good news. | |
1420 for (int i = 0; i < num; i++) | |
1421 karray[i] = wf.participant(i); | |
1422 #ifndef PRODUCT | |
1423 // Make sure the dependency mechanism will pass this discovery: | |
1424 if (VerifyDependencies) { | |
1425 // Turn off dependency tracing while actually testing deps. | |
1426 FlagSetting fs(TraceDependencies, false); | |
1427 switch (Dependencies::is_concrete_klass(ctxk)? -1: num) { | |
1428 case -1: // ctxk was itself concrete | |
1429 guarantee(num == 1 && karray[0] == ctxk, "verify dep."); | |
1430 break; | |
1431 case 0: | |
1432 guarantee(NULL == (void *)check_abstract_with_no_concrete_subtype(ctxk), | |
1433 "verify dep."); | |
1434 break; | |
1435 case 1: | |
1436 guarantee(NULL == (void *) | |
1437 check_abstract_with_unique_concrete_subtype(ctxk, karray[0]), | |
1438 "verify dep."); | |
1439 break; | |
1440 case 2: | |
1441 guarantee(NULL == (void *) | |
1442 check_abstract_with_exclusive_concrete_subtypes(ctxk, | |
1443 karray[0], | |
1444 karray[1]), | |
1445 "verify dep."); | |
1446 break; | |
1447 default: | |
1448 ShouldNotReachHere(); // klen > 2 yet supported | |
1449 } | |
1450 } | |
1451 #endif //PRODUCT | |
1452 return num; | |
1453 } | |
1454 | |
1455 // If a class (or interface) has a unique concrete method uniqm, return NULL. | |
1456 // 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
|
1457 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
|
1458 KlassDepChange* changes) { |
0 | 1459 // Here is a missing optimization: If uniqm->is_final(), |
1460 // we don't really need to search beneath it for overrides. | |
1461 // This is probably not important, since we don't use dependencies | |
1462 // to track final methods. (They can't be "definalized".) | |
1463 ClassHierarchyWalker wf(uniqm->method_holder(), uniqm); | |
1464 return wf.find_witness_definer(ctxk, changes); | |
1465 } | |
1466 | |
1467 // Find the set of all non-abstract methods under ctxk that match m. | |
1468 // (The method m must be defined or inherited in ctxk.) | |
1469 // Include m itself in the set, unless it is abstract. | |
1470 // 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
|
1471 Method* Dependencies::find_unique_concrete_method(Klass* ctxk, Method* m) { |
0 | 1472 ClassHierarchyWalker wf(m); |
1473 assert(wf.check_method_context(ctxk, m), "proper context"); | |
1474 wf.record_witnesses(1); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1475 Klass* wit = wf.find_witness_definer(ctxk); |
0 | 1476 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
|
1477 Method* fm = wf.found_method(0); // Will be NULL if num_parts == 0. |
0 | 1478 if (Dependencies::is_concrete_method(m)) { |
1479 if (fm == NULL) { | |
1480 // It turns out that m was always the only implementation. | |
1481 fm = m; | |
1482 } else if (fm != m) { | |
1483 // Two conflicting implementations after all. | |
1484 // (This can happen if m is inherited into ctxk and fm overrides it.) | |
1485 return NULL; | |
1486 } | |
1487 } | |
1488 #ifndef PRODUCT | |
1489 // Make sure the dependency mechanism will pass this discovery: | |
1490 if (VerifyDependencies && fm != NULL) { | |
1491 guarantee(NULL == (void *)check_unique_concrete_method(ctxk, fm), | |
1492 "verify dep."); | |
1493 } | |
1494 #endif //PRODUCT | |
1495 return fm; | |
1496 } | |
1497 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1498 Klass* Dependencies::check_exclusive_concrete_methods(Klass* ctxk, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1499 Method* m1, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1500 Method* m2, |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1501 KlassDepChange* changes) { |
0 | 1502 ClassHierarchyWalker wf(m1); |
1503 wf.add_participant(m1->method_holder()); | |
1504 wf.add_participant(m2->method_holder()); | |
1505 return wf.find_witness_definer(ctxk, changes); | |
1506 } | |
1507 | |
1508 // Find the set of all non-abstract methods under ctxk that match m[0]. | |
1509 // (The method m[0] must be defined or inherited in ctxk.) | |
1510 // Include m itself in the set, unless it is abstract. | |
1511 // Fill the given array m[0..(mlen-1)] with this set, and return the length. | |
1512 // (The length may be zero if no concrete methods are found anywhere.) | |
1513 // 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
|
1514 int Dependencies::find_exclusive_concrete_methods(Klass* ctxk, |
0 | 1515 int mlen, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1516 Method* marray[]) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1517 Method* m0 = marray[0]; |
0 | 1518 ClassHierarchyWalker wf(m0); |
1519 assert(wf.check_method_context(ctxk, m0), "proper context"); | |
1520 wf.record_witnesses(mlen); | |
1521 bool participants_hide_witnesses = true; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1522 Klass* wit = wf.find_witness_definer(ctxk); |
0 | 1523 if (wit != NULL) return -1; // Too many witnesses. |
1524 int num = wf.num_participants(); | |
1525 assert(num <= mlen, "oob"); | |
1526 // Keep track of whether m is also part of the result set. | |
1527 int mfill = 0; | |
1528 assert(marray[mfill] == m0, "sanity"); | |
1529 if (Dependencies::is_concrete_method(m0)) | |
1530 mfill++; // keep m0 as marray[0], the first result | |
1531 for (int i = 0; i < num; i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1532 Method* fm = wf.found_method(i); |
0 | 1533 if (fm == m0) continue; // Already put this guy in the list. |
1534 if (mfill == mlen) { | |
1535 return -1; // Oops. Too many methods after all! | |
1536 } | |
1537 marray[mfill++] = fm; | |
1538 } | |
1539 #ifndef PRODUCT | |
1540 // Make sure the dependency mechanism will pass this discovery: | |
1541 if (VerifyDependencies) { | |
1542 // Turn off dependency tracing while actually testing deps. | |
1543 FlagSetting fs(TraceDependencies, false); | |
1544 switch (mfill) { | |
1545 case 1: | |
1546 guarantee(NULL == (void *)check_unique_concrete_method(ctxk, marray[0]), | |
1547 "verify dep."); | |
1548 break; | |
1549 case 2: | |
1550 guarantee(NULL == (void *) | |
1551 check_exclusive_concrete_methods(ctxk, marray[0], marray[1]), | |
1552 "verify dep."); | |
1553 break; | |
1554 default: | |
1555 ShouldNotReachHere(); // mlen > 2 yet supported | |
1556 } | |
1557 } | |
1558 #endif //PRODUCT | |
1559 return mfill; | |
1560 } | |
1561 | |
1562 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1563 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
|
1564 Klass* search_at = ctxk; |
0 | 1565 if (changes != NULL) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1566 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
|
1567 return find_finalizable_subclass(search_at); |
0 | 1568 } |
1569 | |
1570 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1571 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
|
1572 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
|
1573 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
|
1574 if (changes == NULL) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1575 // Validate all CallSites |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1576 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
|
1577 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
|
1578 } else { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1579 // Validate the given CallSite |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1580 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
|
1581 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
|
1582 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
|
1583 } |
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 return NULL; // assertion still valid |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1586 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1587 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1588 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1589 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
|
1590 if (witness != NULL) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1591 if (TraceDependencies) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1592 print_dependency(witness, /*verbose=*/ true); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1593 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1594 // 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
|
1595 log_dependency(witness); |
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 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1598 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1599 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1600 Klass* Dependencies::DepStream::check_klass_dependency(KlassDepChange* changes) { |
0 | 1601 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
|
1602 Dependencies::check_valid_dependency_type(type()); |
0 | 1603 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1604 Klass* witness = NULL; |
0 | 1605 switch (type()) { |
1606 case evol_method: | |
1607 witness = check_evol_method(method_argument(0)); | |
1608 break; | |
1609 case leaf_type: | |
1610 witness = check_leaf_type(context_type()); | |
1611 break; | |
1612 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
|
1613 witness = check_abstract_with_unique_concrete_subtype(context_type(), type_argument(1), changes); |
0 | 1614 break; |
1615 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
|
1616 witness = check_abstract_with_no_concrete_subtype(context_type(), changes); |
0 | 1617 break; |
1618 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
|
1619 witness = check_concrete_with_no_concrete_subtype(context_type(), changes); |
0 | 1620 break; |
1621 case unique_concrete_method: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1622 witness = check_unique_concrete_method(context_type(), method_argument(1), changes); |
0 | 1623 break; |
1624 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
|
1625 witness = check_abstract_with_exclusive_concrete_subtypes(context_type(), type_argument(1), type_argument(2), changes); |
0 | 1626 break; |
1627 case exclusive_concrete_methods_2: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1628 witness = check_exclusive_concrete_methods(context_type(), method_argument(1), method_argument(2), changes); |
0 | 1629 break; |
1630 case no_finalizable_subclasses: | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1631 witness = check_has_no_finalizable_subclasses(context_type(), changes); |
0 | 1632 break; |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1633 default: |
0 | 1634 witness = NULL; |
1635 break; | |
1636 } | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1637 trace_and_log_witness(witness); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1638 return witness; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1639 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1640 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1641 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1642 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
|
1643 assert_locked_or_safepoint(Compile_lock); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1644 Dependencies::check_valid_dependency_type(type()); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1645 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1646 Klass* witness = NULL; |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1647 switch (type()) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1648 case call_site_target_value: |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1649 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
|
1650 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1651 default: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1652 witness = NULL; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1653 break; |
0 | 1654 } |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1655 trace_and_log_witness(witness); |
0 | 1656 return witness; |
1657 } | |
1658 | |
1659 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1660 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
|
1661 // Handle klass dependency |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1662 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
|
1663 return check_klass_dependency(changes.as_klass_change()); |
0 | 1664 |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1665 // Handle CallSite dependency |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1666 if (changes.is_call_site_change()) |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1667 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
|
1668 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1669 // irrelevant dependency; skip it |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1670 return NULL; |
0 | 1671 } |
1672 | |
1673 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1674 void DepChange::print() { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1675 int nsup = 0, nint = 0; |
0 | 1676 for (ContextStream str(*this); str.next(); ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1677 Klass* k = str.klass(); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1678 switch (str.change_type()) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1679 case Change_new_type: |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1680 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
|
1681 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1682 case Change_new_sub: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1683 if (!WizardMode) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1684 ++nsup; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1685 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1686 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
|
1687 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1688 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1689 case Change_new_impl: |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1690 if (!WizardMode) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1691 ++nint; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1692 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1693 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
|
1694 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1695 break; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1696 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1697 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1698 if (nsup + nint != 0) { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1699 tty->print_cr(" context supers = %d, interfaces = %d", nsup, nint); |
0 | 1700 } |
1701 } | |
1702 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1703 void DepChange::ContextStream::start() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1704 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
|
1705 _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
|
1706 _klass = new_type; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1707 _ti_base = NULL; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1708 _ti_index = 0; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1709 _ti_limit = 0; |
0 | 1710 } |
1711 | |
1712 bool DepChange::ContextStream::next() { | |
1713 switch (_change_type) { | |
1714 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
|
1715 _ti_base = InstanceKlass::cast(_klass)->transitive_interfaces(); |
0 | 1716 _ti_index = 0; |
1717 _change_type = Change_new_type; | |
1718 return true; | |
1719 case Change_new_type: | |
1720 // fall through: | |
1721 _change_type = Change_new_sub; | |
1722 case Change_new_sub: | |
54
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1723 // 6598190: brackets workaround Sun Studio C++ compiler bug 6629277 |
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1724 { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1725 _klass = InstanceKlass::cast(_klass)->super(); |
54
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1726 if (_klass != NULL) { |
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1727 return true; |
d4a0f561287a
6598190: JPRT tests fail when run with -XX:+CheckUnhandledOops
sbohne
parents:
0
diff
changeset
|
1728 } |
0 | 1729 } |
1730 // else set up _ti_limit and fall through: | |
1731 _ti_limit = (_ti_base == NULL) ? 0 : _ti_base->length(); | |
1732 _change_type = Change_new_impl; | |
1733 case Change_new_impl: | |
1734 if (_ti_index < _ti_limit) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1735 _klass = _ti_base->at(_ti_index++); |
0 | 1736 return true; |
1737 } | |
1738 // fall through: | |
1739 _change_type = NO_CHANGE; // iterator is exhausted | |
1740 case NO_CHANGE: | |
1741 break; | |
1742 default: | |
1743 ShouldNotReachHere(); | |
1744 } | |
1745 return false; | |
1746 } | |
1747 | |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1748 void KlassDepChange::initialize() { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1749 // 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
|
1750 assert_lock_strong(Compile_lock); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1751 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1752 // 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
|
1753 // Mark transitive interfaces |
0 | 1754 for (ContextStream str(*this); str.next(); ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1755 Klass* d = str.klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1756 assert(!InstanceKlass::cast(d)->is_marked_dependent(), "checking"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1757 InstanceKlass::cast(d)->set_is_marked_dependent(true); |
0 | 1758 } |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1759 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1760 |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1761 KlassDepChange::~KlassDepChange() { |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1762 // 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
|
1763 // Unmark transitive interfaces |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1764 for (ContextStream str(*this); str.next(); ) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1765 Klass* d = str.klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1766 InstanceKlass::cast(d)->set_is_marked_dependent(false); |
0 | 1767 } |
1768 } | |
1769 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1770 bool KlassDepChange::involves_context(Klass* k) { |
6983 | 1771 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
|
1772 return false; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1773 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
5998
diff
changeset
|
1774 InstanceKlass* ik = InstanceKlass::cast(k); |
3852
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1775 bool is_contained = ik->is_marked_dependent(); |
6983 | 1776 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
|
1777 "correct marking of potential context types"); |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1778 return is_contained; |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1779 } |
fdb992d83a87
7071653: JSR 292: call site change notification should be pushed not pulled
twisti
parents:
2426
diff
changeset
|
1780 |
0 | 1781 #ifndef PRODUCT |
1782 void Dependencies::print_statistics() { | |
1783 if (deps_find_witness_print != 0) { | |
1784 // Call one final time, to flush out the data. | |
1785 deps_find_witness_print = -1; | |
1786 count_find_witness_calls(); | |
1787 } | |
1788 } | |
1789 #endif |