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