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