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