author | coleenp |
Tue, 28 Aug 2018 18:17:01 -0400 | |
changeset 51554 | 5b0d86499960 |
parent 49658 | 8237a91c1cca |
child 51997 | 9ce37fa2e179 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
51554
5b0d86499960
8209958: Clean up duplicate basic array type statics in Universe
coleenp
parents:
49658
diff
changeset
|
2 |
* Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. |
1 | 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 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5420
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "ci/ciCallSite.hpp" |
|
27 |
#include "ci/ciInstance.hpp" |
|
28 |
#include "ci/ciInstanceKlass.hpp" |
|
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13195
diff
changeset
|
29 |
#include "ci/ciMemberName.hpp" |
7397 | 30 |
#include "ci/ciMethod.hpp" |
31 |
#include "ci/ciMethodData.hpp" |
|
32 |
#include "ci/ciMethodHandle.hpp" |
|
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
33 |
#include "ci/ciMethodType.hpp" |
7397 | 34 |
#include "ci/ciNullObject.hpp" |
35 |
#include "ci/ciObjArray.hpp" |
|
36 |
#include "ci/ciObjArrayKlass.hpp" |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
37 |
#include "ci/ciObject.hpp" |
7397 | 38 |
#include "ci/ciObjectFactory.hpp" |
39 |
#include "ci/ciSymbol.hpp" |
|
40 |
#include "ci/ciTypeArray.hpp" |
|
41 |
#include "ci/ciTypeArrayKlass.hpp" |
|
49449
ef5d5d343e2a
8199263: Split interfaceSupport.hpp to not require including .inline.hpp files
coleenp
parents:
47887
diff
changeset
|
42 |
#include "ci/ciUtilities.inline.hpp" |
29081
c61eb4914428
8072911: Remove includes of oop.inline.hpp from .hpp files
stefank
parents:
27685
diff
changeset
|
43 |
#include "classfile/javaClasses.inline.hpp" |
7397 | 44 |
#include "classfile/systemDictionary.hpp" |
30764 | 45 |
#include "gc/shared/collectedHeap.inline.hpp" |
7397 | 46 |
#include "memory/allocation.inline.hpp" |
47 |
#include "oops/oop.inline.hpp" |
|
48 |
#include "runtime/fieldType.hpp" |
|
49449
ef5d5d343e2a
8199263: Split interfaceSupport.hpp to not require including .inline.hpp files
coleenp
parents:
47887
diff
changeset
|
49 |
#include "runtime/handles.inline.hpp" |
27684
e0391b2bf625
8064581: Move INCLUDE_ALL_GCS include section to the end of the include list
stefank
parents:
25946
diff
changeset
|
50 |
#include "utilities/macros.hpp" |
1 | 51 |
|
52 |
// ciObjectFactory |
|
53 |
// |
|
54 |
// This class handles requests for the creation of new instances |
|
55 |
// of ciObject and its subclasses. It contains a caching mechanism |
|
56 |
// which ensures that for each oop, at most one ciObject is created. |
|
57 |
// This invariant allows more efficient implementation of ciObject. |
|
58 |
// |
|
59 |
// Implementation note: the oop->ciObject mapping is represented as |
|
60 |
// a table stored in an array. Even though objects are moved |
|
61 |
// by the garbage collector, the compactor preserves their relative |
|
62 |
// order; address comparison of oops (in perm space) is safe so long |
|
63 |
// as we prohibit GC during our comparisons. We currently use binary |
|
64 |
// search to find the oop in the table, and inserting a new oop |
|
65 |
// into the table may be costly. If this cost ends up being |
|
66 |
// problematic the underlying data structure can be switched to some |
|
67 |
// sort of balanced binary tree. |
|
68 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
69 |
GrowableArray<ciMetadata*>* ciObjectFactory::_shared_ci_metadata = NULL; |
1 | 70 |
ciSymbol* ciObjectFactory::_shared_ci_symbols[vmSymbols::SID_LIMIT]; |
71 |
int ciObjectFactory::_shared_ident_limit = 0; |
|
72 |
volatile bool ciObjectFactory::_initialized = false; |
|
73 |
||
74 |
||
75 |
// ------------------------------------------------------------------ |
|
76 |
// ciObjectFactory::ciObjectFactory |
|
77 |
ciObjectFactory::ciObjectFactory(Arena* arena, |
|
78 |
int expected_size) { |
|
79 |
||
80 |
for (int i = 0; i < NON_PERM_BUCKETS; i++) { |
|
81 |
_non_perm_bucket[i] = NULL; |
|
82 |
} |
|
83 |
_non_perm_count = 0; |
|
84 |
||
85 |
_next_ident = _shared_ident_limit; |
|
86 |
_arena = arena; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
87 |
_ci_metadata = new (arena) GrowableArray<ciMetadata*>(arena, expected_size, 0, NULL); |
1 | 88 |
|
89 |
// If the shared ci objects exist append them to this factory's objects |
|
90 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
91 |
if (_shared_ci_metadata != NULL) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
92 |
_ci_metadata->appendAll(_shared_ci_metadata); |
1 | 93 |
} |
94 |
||
95 |
_unloaded_methods = new (arena) GrowableArray<ciMethod*>(arena, 4, 0, NULL); |
|
96 |
_unloaded_klasses = new (arena) GrowableArray<ciKlass*>(arena, 8, 0, NULL); |
|
5882 | 97 |
_unloaded_instances = new (arena) GrowableArray<ciInstance*>(arena, 4, 0, NULL); |
1 | 98 |
_return_addresses = |
99 |
new (arena) GrowableArray<ciReturnAddress*>(arena, 8, 0, NULL); |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
100 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
101 |
_symbols = new (arena) GrowableArray<ciSymbol*>(arena, 100, 0, NULL); |
1 | 102 |
} |
103 |
||
104 |
// ------------------------------------------------------------------ |
|
105 |
// ciObjectFactory::ciObjectFactory |
|
106 |
void ciObjectFactory::initialize() { |
|
107 |
ASSERT_IN_VM; |
|
108 |
JavaThread* thread = JavaThread::current(); |
|
109 |
HandleMark handle_mark(thread); |
|
110 |
||
111 |
// This Arena is long lived and exists in the resource mark of the |
|
112 |
// compiler thread that initializes the initial ciObjectFactory which |
|
113 |
// creates the shared ciObjects that all later ciObjectFactories use. |
|
25946 | 114 |
Arena* arena = new (mtCompiler) Arena(mtCompiler); |
1 | 115 |
ciEnv initial(arena); |
116 |
ciEnv* env = ciEnv::current(); |
|
117 |
env->_factory->init_shared_objects(); |
|
118 |
||
119 |
_initialized = true; |
|
120 |
||
121 |
} |
|
122 |
||
123 |
void ciObjectFactory::init_shared_objects() { |
|
124 |
||
125 |
_next_ident = 1; // start numbering CI objects at 1 |
|
126 |
||
127 |
{ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
128 |
// Create the shared symbols, but not in _shared_ci_metadata. |
1 | 129 |
int i; |
130 |
for (i = vmSymbols::FIRST_SID; i < vmSymbols::SID_LIMIT; i++) { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
131 |
Symbol* vmsym = vmSymbols::symbol_at((vmSymbols::SID) i); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
132 |
assert(vmSymbols::find_sid(vmsym) == i, "1-1 mapping"); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
133 |
ciSymbol* sym = new (_arena) ciSymbol(vmsym, (vmSymbols::SID) i); |
1 | 134 |
init_ident_of(sym); |
135 |
_shared_ci_symbols[i] = sym; |
|
136 |
} |
|
137 |
#ifdef ASSERT |
|
138 |
for (i = vmSymbols::FIRST_SID; i < vmSymbols::SID_LIMIT; i++) { |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
139 |
Symbol* vmsym = vmSymbols::symbol_at((vmSymbols::SID) i); |
1 | 140 |
ciSymbol* sym = vm_symbol_at((vmSymbols::SID) i); |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
141 |
assert(sym->get_symbol() == vmsym, "oop must match"); |
1 | 142 |
} |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
143 |
assert(ciSymbol::void_class_signature()->get_symbol() == vmSymbols::void_class_signature(), "spot check"); |
1 | 144 |
#endif |
145 |
} |
|
146 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
147 |
_ci_metadata = new (_arena) GrowableArray<ciMetadata*>(_arena, 64, 0, NULL); |
1 | 148 |
|
149 |
for (int i = T_BOOLEAN; i <= T_CONFLICT; i++) { |
|
150 |
BasicType t = (BasicType)i; |
|
13969
d2a189b83b87
7054512: Compress class pointers after perm gen removal
roland
parents:
13929
diff
changeset
|
151 |
if (type2name(t) != NULL && t != T_OBJECT && t != T_ARRAY && t != T_NARROWOOP && t != T_NARROWKLASS) { |
1 | 152 |
ciType::_basic_types[t] = new (_arena) ciType(t); |
153 |
init_ident_of(ciType::_basic_types[t]); |
|
154 |
} |
|
155 |
} |
|
156 |
||
157 |
ciEnv::_null_object_instance = new (_arena) ciNullObject(); |
|
158 |
init_ident_of(ciEnv::_null_object_instance); |
|
4571 | 159 |
|
160 |
#define WK_KLASS_DEFN(name, ignore_s, opt) \ |
|
161 |
if (SystemDictionary::name() != NULL) \ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
162 |
ciEnv::_##name = get_metadata(SystemDictionary::name())->as_instance_klass(); |
4571 | 163 |
|
164 |
WK_KLASSES_DO(WK_KLASS_DEFN) |
|
165 |
#undef WK_KLASS_DEFN |
|
1 | 166 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
167 |
for (int len = -1; len != _ci_metadata->length(); ) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
168 |
len = _ci_metadata->length(); |
1 | 169 |
for (int i2 = 0; i2 < len; i2++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
170 |
ciMetadata* obj = _ci_metadata->at(i2); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
171 |
assert (obj->is_metadata(), "what else would it be?"); |
1 | 172 |
if (obj->is_loaded() && obj->is_instance_klass()) { |
173 |
obj->as_instance_klass()->compute_nonstatic_fields(); |
|
174 |
} |
|
175 |
} |
|
176 |
} |
|
177 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
178 |
ciEnv::_unloaded_cisymbol = ciObjectFactory::get_symbol(vmSymbols::dummy_symbol()); |
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
179 |
// Create dummy InstanceKlass and ObjArrayKlass object and assign them idents |
1 | 180 |
ciEnv::_unloaded_ciinstance_klass = new (_arena) ciInstanceKlass(ciEnv::_unloaded_cisymbol, NULL, NULL); |
181 |
init_ident_of(ciEnv::_unloaded_ciinstance_klass); |
|
182 |
ciEnv::_unloaded_ciobjarrayklass = new (_arena) ciObjArrayKlass(ciEnv::_unloaded_cisymbol, ciEnv::_unloaded_ciinstance_klass, 1); |
|
183 |
init_ident_of(ciEnv::_unloaded_ciobjarrayklass); |
|
184 |
assert(ciEnv::_unloaded_ciobjarrayklass->is_obj_array_klass(), "just checking"); |
|
185 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
186 |
get_metadata(Universe::boolArrayKlassObj()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
187 |
get_metadata(Universe::charArrayKlassObj()); |
51554
5b0d86499960
8209958: Clean up duplicate basic array type statics in Universe
coleenp
parents:
49658
diff
changeset
|
188 |
get_metadata(Universe::floatArrayKlassObj()); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
189 |
get_metadata(Universe::doubleArrayKlassObj()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
190 |
get_metadata(Universe::byteArrayKlassObj()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
191 |
get_metadata(Universe::shortArrayKlassObj()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
192 |
get_metadata(Universe::intArrayKlassObj()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
193 |
get_metadata(Universe::longArrayKlassObj()); |
1 | 194 |
|
195 |
||
196 |
||
197 |
assert(_non_perm_count == 0, "no shared non-perm objects"); |
|
198 |
||
199 |
// The shared_ident_limit is the first ident number that will |
|
200 |
// be used for non-shared objects. That is, numbers less than |
|
201 |
// this limit are permanently assigned to shared CI objects, |
|
202 |
// while the higher numbers are recycled afresh by each new ciEnv. |
|
203 |
||
204 |
_shared_ident_limit = _next_ident; |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
205 |
_shared_ci_metadata = _ci_metadata; |
1 | 206 |
} |
207 |
||
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
208 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
209 |
ciSymbol* ciObjectFactory::get_symbol(Symbol* key) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
210 |
vmSymbols::SID sid = vmSymbols::find_sid(key); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
211 |
if (sid != vmSymbols::NO_SID) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
212 |
// do not pollute the main cache with it |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
213 |
return vm_symbol_at(sid); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
214 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
215 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
216 |
assert(vmSymbols::find_sid(key) == vmSymbols::NO_SID, ""); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
217 |
ciSymbol* s = new (arena()) ciSymbol(key, vmSymbols::NO_SID); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
218 |
_symbols->push(s); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
219 |
return s; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
220 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
221 |
|
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
222 |
// Decrement the refcount when done on symbols referenced by this compilation. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
223 |
void ciObjectFactory::remove_symbols() { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
224 |
for (int i = 0; i < _symbols->length(); i++) { |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
225 |
ciSymbol* s = _symbols->at(i); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
226 |
s->get_symbol()->decrement_refcount(); |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
227 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
228 |
// Since _symbols is resource allocated we're not allowed to delete it |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
229 |
// but it'll go away just the same. |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
230 |
} |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
231 |
|
1 | 232 |
// ------------------------------------------------------------------ |
233 |
// ciObjectFactory::get |
|
234 |
// |
|
235 |
// Get the ciObject corresponding to some oop. If the ciObject has |
|
236 |
// already been created, it is returned. Otherwise, a new ciObject |
|
237 |
// is created. |
|
238 |
ciObject* ciObjectFactory::get(oop key) { |
|
239 |
ASSERT_IN_VM; |
|
240 |
||
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
241 |
assert(Universe::heap()->is_in_reserved(key), "must be"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
242 |
|
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
243 |
NonPermObject* &bucket = find_non_perm(key); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
244 |
if (bucket != NULL) { |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
245 |
return bucket->object(); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
246 |
} |
1 | 247 |
|
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
248 |
// The ciObject does not yet exist. Create it and insert it |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
249 |
// into the cache. |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
36315
diff
changeset
|
250 |
Handle keyHandle(Thread::current(), key); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
251 |
ciObject* new_object = create_new_object(keyHandle()); |
49658 | 252 |
assert(oopDesc::equals(keyHandle(), new_object->get_oop()), "must be properly recorded"); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
253 |
init_ident_of(new_object); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
254 |
assert(Universe::heap()->is_in_reserved(new_object->get_oop()), "must be"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
255 |
|
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
256 |
// Not a perm-space object. |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
257 |
insert_non_perm(bucket, keyHandle(), new_object); |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
258 |
return new_object; |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
259 |
} |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
260 |
|
36315
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
261 |
int ciObjectFactory::metadata_compare(Metadata* const& key, ciMetadata* const& elt) { |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
262 |
Metadata* value = elt->constant_encoding(); |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
263 |
if (key < value) return -1; |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
264 |
else if (key > value) return 1; |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
265 |
else return 0; |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
266 |
} |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
267 |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
268 |
// ------------------------------------------------------------------ |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
269 |
// ciObjectFactory::get_metadata |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
270 |
// |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
271 |
// Get the ciMetadata corresponding to some Metadata. If the ciMetadata has |
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
272 |
// already been created, it is returned. Otherwise, a new ciMetadata |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
273 |
// is created. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
274 |
ciMetadata* ciObjectFactory::get_metadata(Metadata* key) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
275 |
ASSERT_IN_VM; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
276 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
277 |
#ifdef ASSERT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
278 |
if (CIObjectFactoryVerify) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
279 |
Metadata* last = NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
280 |
for (int j = 0; j< _ci_metadata->length(); j++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
281 |
Metadata* o = _ci_metadata->at(j)->constant_encoding(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
282 |
assert(last < o, "out of order"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
283 |
last = o; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
284 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
285 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
286 |
#endif // ASSERT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
287 |
int len = _ci_metadata->length(); |
36315
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
288 |
bool found = false; |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
289 |
int index = _ci_metadata->find_sorted<Metadata*, ciObjectFactory::metadata_compare>(key, found); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
290 |
#ifdef ASSERT |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
291 |
if (CIObjectFactoryVerify) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
292 |
for (int i=0; i<_ci_metadata->length(); i++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
293 |
if (_ci_metadata->at(i)->constant_encoding() == key) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
294 |
assert(index == i, " bad lookup"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
295 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
296 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
297 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
298 |
#endif |
36315
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
299 |
|
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
300 |
if (!found) { |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
301 |
// The ciMetadata does not yet exist. Create it and insert it |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
302 |
// into the cache. |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
303 |
ciMetadata* new_object = create_new_metadata(key); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
304 |
init_ident_of(new_object); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
305 |
assert(new_object->is_metadata(), "must be"); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
306 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
307 |
if (len != _ci_metadata->length()) { |
1 | 308 |
// creating the new object has recursively entered new objects |
309 |
// into the table. We need to recompute our index. |
|
36315
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
310 |
index = _ci_metadata->find_sorted<Metadata*, ciObjectFactory::metadata_compare>(key, found); |
1 | 311 |
} |
36315
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
312 |
assert(!found, "no double insert"); |
150a415079ae
8007986: GrowableArray should implement binary search
roland
parents:
33611
diff
changeset
|
313 |
_ci_metadata->insert_before(index, new_object); |
1 | 314 |
return new_object; |
315 |
} |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
316 |
return _ci_metadata->at(index)->as_metadata(); |
1 | 317 |
} |
318 |
||
319 |
// ------------------------------------------------------------------ |
|
320 |
// ciObjectFactory::create_new_object |
|
321 |
// |
|
322 |
// Create a new ciObject from an oop. |
|
323 |
// |
|
324 |
// Implementation note: this functionality could be virtual behavior |
|
325 |
// of the oop itself. For now, we explicitly marshal the object. |
|
326 |
ciObject* ciObjectFactory::create_new_object(oop o) { |
|
327 |
EXCEPTION_CONTEXT; |
|
328 |
||
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
329 |
if (o->is_instance()) { |
1 | 330 |
instanceHandle h_i(THREAD, (instanceOop)o); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8076
diff
changeset
|
331 |
if (java_lang_invoke_CallSite::is_instance(o)) |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4566
diff
changeset
|
332 |
return new (arena()) ciCallSite(h_i); |
13391
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13195
diff
changeset
|
333 |
else if (java_lang_invoke_MemberName::is_instance(o)) |
30245956af37
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
13195
diff
changeset
|
334 |
return new (arena()) ciMemberName(h_i); |
8676
9098d4e927e1
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
8076
diff
changeset
|
335 |
else if (java_lang_invoke_MethodHandle::is_instance(o)) |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4566
diff
changeset
|
336 |
return new (arena()) ciMethodHandle(h_i); |
13929
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
337 |
else if (java_lang_invoke_MethodType::is_instance(o)) |
8da0dc50a6e4
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
twisti
parents:
13728
diff
changeset
|
338 |
return new (arena()) ciMethodType(h_i); |
4567
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4566
diff
changeset
|
339 |
else |
7fc02fbe5c7a
6893268: additional dynamic language related optimizations in C2
twisti
parents:
4566
diff
changeset
|
340 |
return new (arena()) ciInstance(h_i); |
1 | 341 |
} else if (o->is_objArray()) { |
342 |
objArrayHandle h_oa(THREAD, (objArrayOop)o); |
|
343 |
return new (arena()) ciObjArray(h_oa); |
|
344 |
} else if (o->is_typeArray()) { |
|
345 |
typeArrayHandle h_ta(THREAD, (typeArrayOop)o); |
|
346 |
return new (arena()) ciTypeArray(h_ta); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
347 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
348 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
349 |
// The oop is of some type not supported by the compiler interface. |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
350 |
ShouldNotReachHere(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
351 |
return NULL; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
352 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
353 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
354 |
// ------------------------------------------------------------------ |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
355 |
// ciObjectFactory::create_new_metadata |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
356 |
// |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
357 |
// Create a new ciMetadata from a Metadata*. |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
358 |
// |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
359 |
// Implementation note: in order to keep Metadata live, an auxiliary ciObject |
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
360 |
// is used, which points to it's holder. |
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
361 |
ciMetadata* ciObjectFactory::create_new_metadata(Metadata* o) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
362 |
EXCEPTION_CONTEXT; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
363 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
364 |
if (o->is_klass()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
365 |
Klass* k = (Klass*)o; |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33589
diff
changeset
|
366 |
if (k->is_instance_klass()) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46271
diff
changeset
|
367 |
return new (arena()) ciInstanceKlass(k); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33589
diff
changeset
|
368 |
} else if (k->is_objArray_klass()) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46271
diff
changeset
|
369 |
return new (arena()) ciObjArrayKlass(k); |
33611
9abd65805e19
8139203: Consistent naming for klass type predicates
coleenp
parents:
33589
diff
changeset
|
370 |
} else if (k->is_typeArray_klass()) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46271
diff
changeset
|
371 |
return new (arena()) ciTypeArrayKlass(k); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
372 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
373 |
} else if (o->is_method()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
374 |
methodHandle h_m(THREAD, (Method*)o); |
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
375 |
ciEnv *env = CURRENT_THREAD_ENV; |
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
376 |
ciInstanceKlass* holder = env->get_instance_klass(h_m()->method_holder()); |
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
377 |
return new (arena()) ciMethod(h_m, holder); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
378 |
} else if (o->is_methodData()) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
379 |
// Hold methodHandle alive - might not be necessary ??? |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
380 |
methodHandle h_m(THREAD, ((MethodData*)o)->method()); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
381 |
return new (arena()) ciMethodData((MethodData*)o); |
1 | 382 |
} |
383 |
||
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
384 |
// The Metadata* is of some type not supported by the compiler interface. |
1 | 385 |
ShouldNotReachHere(); |
386 |
return NULL; |
|
387 |
} |
|
388 |
||
389 |
//------------------------------------------------------------------ |
|
390 |
// ciObjectFactory::get_unloaded_method |
|
391 |
// |
|
392 |
// Get the ciMethod representing an unloaded/unfound method. |
|
393 |
// |
|
394 |
// Implementation note: unloaded methods are currently stored in |
|
395 |
// an unordered array, requiring a linear-time lookup for each |
|
396 |
// unloaded method. This may need to change. |
|
397 |
ciMethod* ciObjectFactory::get_unloaded_method(ciInstanceKlass* holder, |
|
398 |
ciSymbol* name, |
|
10734
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
399 |
ciSymbol* signature, |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
400 |
ciInstanceKlass* accessor) { |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
401 |
ciSignature* that = NULL; |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
402 |
for (int i = 0; i < _unloaded_methods->length(); i++) { |
1 | 403 |
ciMethod* entry = _unloaded_methods->at(i); |
404 |
if (entry->holder()->equals(holder) && |
|
405 |
entry->name()->equals(name) && |
|
406 |
entry->signature()->as_symbol()->equals(signature)) { |
|
10734
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
407 |
// Short-circuit slow resolve. |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
408 |
if (entry->signature()->accessing_klass() == accessor) { |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
409 |
// We've found a match. |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
410 |
return entry; |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
411 |
} else { |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
412 |
// Lazily create ciSignature |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
413 |
if (that == NULL) that = new (arena()) ciSignature(accessor, constantPoolHandle(), signature); |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
414 |
if (entry->signature()->equals(that)) { |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
415 |
// We've found a match. |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
416 |
return entry; |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
417 |
} |
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
418 |
} |
1 | 419 |
} |
420 |
} |
|
421 |
||
422 |
// This is a new unloaded method. Create it and stick it in |
|
423 |
// the cache. |
|
10734
065435337883
7092712: JSR 292: unloaded invokedynamic call sites can lead to a crash with signature types not on BCP
twisti
parents:
8725
diff
changeset
|
424 |
ciMethod* new_method = new (arena()) ciMethod(holder, name, signature, accessor); |
1 | 425 |
|
426 |
init_ident_of(new_method); |
|
427 |
_unloaded_methods->append(new_method); |
|
428 |
||
429 |
return new_method; |
|
430 |
} |
|
431 |
||
432 |
//------------------------------------------------------------------ |
|
433 |
// ciObjectFactory::get_unloaded_klass |
|
434 |
// |
|
435 |
// Get a ciKlass representing an unloaded klass. |
|
436 |
// |
|
437 |
// Implementation note: unloaded klasses are currently stored in |
|
438 |
// an unordered array, requiring a linear-time lookup for each |
|
439 |
// unloaded klass. This may need to change. |
|
440 |
ciKlass* ciObjectFactory::get_unloaded_klass(ciKlass* accessing_klass, |
|
441 |
ciSymbol* name, |
|
442 |
bool create_if_not_found) { |
|
443 |
EXCEPTION_CONTEXT; |
|
444 |
oop loader = NULL; |
|
445 |
oop domain = NULL; |
|
446 |
if (accessing_klass != NULL) { |
|
447 |
loader = accessing_klass->loader(); |
|
448 |
domain = accessing_klass->protection_domain(); |
|
449 |
} |
|
450 |
for (int i=0; i<_unloaded_klasses->length(); i++) { |
|
451 |
ciKlass* entry = _unloaded_klasses->at(i); |
|
452 |
if (entry->name()->equals(name) && |
|
49658 | 453 |
oopDesc::equals(entry->loader(), loader) && |
454 |
oopDesc::equals(entry->protection_domain(), domain)) { |
|
1 | 455 |
// We've found a match. |
456 |
return entry; |
|
457 |
} |
|
458 |
} |
|
459 |
||
460 |
if (!create_if_not_found) |
|
461 |
return NULL; |
|
462 |
||
463 |
// This is a new unloaded klass. Create it and stick it in |
|
464 |
// the cache. |
|
465 |
ciKlass* new_klass = NULL; |
|
466 |
||
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
467 |
// Two cases: this is an unloaded ObjArrayKlass or an |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
468 |
// unloaded InstanceKlass. Deal with both. |
1 | 469 |
if (name->byte_at(0) == '[') { |
470 |
// Decompose the name.' |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
471 |
FieldArrayInfo fd; |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
472 |
BasicType element_type = FieldType::get_array_info(name->get_symbol(), |
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
473 |
fd, THREAD); |
1 | 474 |
if (HAS_PENDING_EXCEPTION) { |
475 |
CLEAR_PENDING_EXCEPTION; |
|
476 |
CURRENT_THREAD_ENV->record_out_of_memory_failure(); |
|
477 |
return ciEnv::_unloaded_ciobjarrayklass; |
|
478 |
} |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
479 |
int dimension = fd.dimension(); |
1 | 480 |
assert(element_type != T_ARRAY, "unsuccessful decomposition"); |
481 |
ciKlass* element_klass = NULL; |
|
482 |
if (element_type == T_OBJECT) { |
|
483 |
ciEnv *env = CURRENT_THREAD_ENV; |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7397
diff
changeset
|
484 |
ciSymbol* ci_name = env->get_symbol(fd.object_key()); |
1 | 485 |
element_klass = |
486 |
env->get_klass_by_name(accessing_klass, ci_name, false)->as_instance_klass(); |
|
487 |
} else { |
|
488 |
assert(dimension > 1, "one dimensional type arrays are always loaded."); |
|
489 |
||
490 |
// The type array itself takes care of one of the dimensions. |
|
491 |
dimension--; |
|
492 |
||
13952
e3cf184080bc
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
13728
diff
changeset
|
493 |
// The element klass is a TypeArrayKlass. |
1 | 494 |
element_klass = ciTypeArrayKlass::make(element_type); |
495 |
} |
|
496 |
new_klass = new (arena()) ciObjArrayKlass(name, element_klass, dimension); |
|
497 |
} else { |
|
498 |
jobject loader_handle = NULL; |
|
499 |
jobject domain_handle = NULL; |
|
500 |
if (accessing_klass != NULL) { |
|
501 |
loader_handle = accessing_klass->loader_handle(); |
|
502 |
domain_handle = accessing_klass->protection_domain_handle(); |
|
503 |
} |
|
504 |
new_klass = new (arena()) ciInstanceKlass(name, loader_handle, domain_handle); |
|
505 |
} |
|
506 |
init_ident_of(new_klass); |
|
507 |
_unloaded_klasses->append(new_klass); |
|
508 |
||
509 |
return new_klass; |
|
510 |
} |
|
511 |
||
5882 | 512 |
|
513 |
//------------------------------------------------------------------ |
|
514 |
// ciObjectFactory::get_unloaded_instance |
|
515 |
// |
|
516 |
// Get a ciInstance representing an as-yet undetermined instance of a given class. |
|
517 |
// |
|
518 |
ciInstance* ciObjectFactory::get_unloaded_instance(ciInstanceKlass* instance_klass) { |
|
519 |
for (int i=0; i<_unloaded_instances->length(); i++) { |
|
520 |
ciInstance* entry = _unloaded_instances->at(i); |
|
521 |
if (entry->klass()->equals(instance_klass)) { |
|
522 |
// We've found a match. |
|
523 |
return entry; |
|
524 |
} |
|
525 |
} |
|
526 |
||
527 |
// This is a new unloaded instance. Create it and stick it in |
|
528 |
// the cache. |
|
529 |
ciInstance* new_instance = new (arena()) ciInstance(instance_klass); |
|
530 |
||
531 |
init_ident_of(new_instance); |
|
532 |
_unloaded_instances->append(new_instance); |
|
533 |
||
534 |
// make sure it looks the way we want: |
|
535 |
assert(!new_instance->is_loaded(), ""); |
|
536 |
assert(new_instance->klass() == instance_klass, ""); |
|
537 |
||
538 |
return new_instance; |
|
539 |
} |
|
540 |
||
541 |
||
542 |
//------------------------------------------------------------------ |
|
543 |
// ciObjectFactory::get_unloaded_klass_mirror |
|
544 |
// |
|
545 |
// Get a ciInstance representing an unresolved klass mirror. |
|
546 |
// |
|
547 |
// Currently, this ignores the parameters and returns a unique unloaded instance. |
|
548 |
ciInstance* ciObjectFactory::get_unloaded_klass_mirror(ciKlass* type) { |
|
549 |
assert(ciEnv::_Class_klass != NULL, ""); |
|
550 |
return get_unloaded_instance(ciEnv::_Class_klass->as_instance_klass()); |
|
551 |
} |
|
552 |
||
553 |
//------------------------------------------------------------------ |
|
554 |
// ciObjectFactory::get_unloaded_method_handle_constant |
|
555 |
// |
|
556 |
// Get a ciInstance representing an unresolved method handle constant. |
|
557 |
// |
|
558 |
// Currently, this ignores the parameters and returns a unique unloaded instance. |
|
559 |
ciInstance* ciObjectFactory::get_unloaded_method_handle_constant(ciKlass* holder, |
|
560 |
ciSymbol* name, |
|
561 |
ciSymbol* signature, |
|
562 |
int ref_kind) { |
|
563 |
if (ciEnv::_MethodHandle_klass == NULL) return NULL; |
|
564 |
return get_unloaded_instance(ciEnv::_MethodHandle_klass->as_instance_klass()); |
|
565 |
} |
|
566 |
||
567 |
//------------------------------------------------------------------ |
|
568 |
// ciObjectFactory::get_unloaded_method_type_constant |
|
569 |
// |
|
570 |
// Get a ciInstance representing an unresolved method type constant. |
|
571 |
// |
|
572 |
// Currently, this ignores the parameters and returns a unique unloaded instance. |
|
573 |
ciInstance* ciObjectFactory::get_unloaded_method_type_constant(ciSymbol* signature) { |
|
574 |
if (ciEnv::_MethodType_klass == NULL) return NULL; |
|
575 |
return get_unloaded_instance(ciEnv::_MethodType_klass->as_instance_klass()); |
|
576 |
} |
|
577 |
||
19710
2f8ca425504e
7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked
roland
parents:
18439
diff
changeset
|
578 |
ciInstance* ciObjectFactory::get_unloaded_object_constant() { |
2f8ca425504e
7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked
roland
parents:
18439
diff
changeset
|
579 |
if (ciEnv::_Object_klass == NULL) return NULL; |
2f8ca425504e
7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked
roland
parents:
18439
diff
changeset
|
580 |
return get_unloaded_instance(ciEnv::_Object_klass->as_instance_klass()); |
2f8ca425504e
7199175: JSR 292: C1 needs patching when invokedynamic/invokehandle call site is not linked
roland
parents:
18439
diff
changeset
|
581 |
} |
5882 | 582 |
|
1 | 583 |
//------------------------------------------------------------------ |
584 |
// ciObjectFactory::get_empty_methodData |
|
585 |
// |
|
586 |
// Get the ciMethodData representing the methodData for a method with |
|
587 |
// none. |
|
588 |
ciMethodData* ciObjectFactory::get_empty_methodData() { |
|
589 |
ciMethodData* new_methodData = new (arena()) ciMethodData(); |
|
590 |
init_ident_of(new_methodData); |
|
591 |
return new_methodData; |
|
592 |
} |
|
593 |
||
594 |
//------------------------------------------------------------------ |
|
595 |
// ciObjectFactory::get_return_address |
|
596 |
// |
|
597 |
// Get a ciReturnAddress for a specified bci. |
|
598 |
ciReturnAddress* ciObjectFactory::get_return_address(int bci) { |
|
599 |
for (int i=0; i<_return_addresses->length(); i++) { |
|
600 |
ciReturnAddress* entry = _return_addresses->at(i); |
|
601 |
if (entry->bci() == bci) { |
|
602 |
// We've found a match. |
|
603 |
return entry; |
|
604 |
} |
|
605 |
} |
|
606 |
||
607 |
ciReturnAddress* new_ret_addr = new (arena()) ciReturnAddress(bci); |
|
608 |
init_ident_of(new_ret_addr); |
|
609 |
_return_addresses->append(new_ret_addr); |
|
610 |
return new_ret_addr; |
|
611 |
} |
|
612 |
||
613 |
// ------------------------------------------------------------------ |
|
614 |
// ciObjectFactory::init_ident_of |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
615 |
void ciObjectFactory::init_ident_of(ciBaseObject* obj) { |
1 | 616 |
obj->set_ident(_next_ident++); |
617 |
} |
|
618 |
||
619 |
static ciObjectFactory::NonPermObject* emptyBucket = NULL; |
|
620 |
||
621 |
// ------------------------------------------------------------------ |
|
622 |
// ciObjectFactory::find_non_perm |
|
623 |
// |
|
624 |
// Use a small hash table, hashed on the klass of the key. |
|
625 |
// If there is no entry in the cache corresponding to this oop, return |
|
626 |
// the null tail of the bucket into which the oop should be inserted. |
|
627 |
ciObjectFactory::NonPermObject* &ciObjectFactory::find_non_perm(oop key) { |
|
27644
f4aa22a934e4
8060147: SIGSEGV in Metadata::mark_on_stack() while marking metadata in ciEnv
vlivanov
parents:
25946
diff
changeset
|
628 |
assert(Universe::heap()->is_in_reserved(key), "must be"); |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
629 |
ciMetadata* klass = get_metadata(key->klass()); |
1 | 630 |
NonPermObject* *bp = &_non_perm_bucket[(unsigned) klass->hash() % NON_PERM_BUCKETS]; |
631 |
for (NonPermObject* p; (p = (*bp)) != NULL; bp = &p->next()) { |
|
632 |
if (is_equal(p, key)) break; |
|
633 |
} |
|
634 |
return (*bp); |
|
635 |
} |
|
636 |
||
637 |
||
638 |
||
639 |
// ------------------------------------------------------------------ |
|
640 |
// Code for for NonPermObject |
|
641 |
// |
|
642 |
inline ciObjectFactory::NonPermObject::NonPermObject(ciObjectFactory::NonPermObject* &bucket, oop key, ciObject* object) { |
|
643 |
assert(ciObjectFactory::is_initialized(), ""); |
|
644 |
_object = object; |
|
645 |
_next = bucket; |
|
646 |
bucket = this; |
|
647 |
} |
|
648 |
||
649 |
||
650 |
||
651 |
// ------------------------------------------------------------------ |
|
652 |
// ciObjectFactory::insert_non_perm |
|
653 |
// |
|
654 |
// Insert a ciObject into the non-perm table. |
|
655 |
void ciObjectFactory::insert_non_perm(ciObjectFactory::NonPermObject* &where, oop key, ciObject* obj) { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
656 |
assert(Universe::heap()->is_in_reserved_or_null(key), "must be"); |
1 | 657 |
assert(&where != &emptyBucket, "must not try to fill empty bucket"); |
658 |
NonPermObject* p = new (arena()) NonPermObject(where, key, obj); |
|
659 |
assert(where == p && is_equal(p, key) && p->object() == obj, "entry must match"); |
|
660 |
assert(find_non_perm(key) == p, "must find the same spot"); |
|
661 |
++_non_perm_count; |
|
662 |
} |
|
663 |
||
664 |
// ------------------------------------------------------------------ |
|
665 |
// ciObjectFactory::vm_symbol_at |
|
666 |
// Get the ciSymbol corresponding to some index in vmSymbols. |
|
667 |
ciSymbol* ciObjectFactory::vm_symbol_at(int index) { |
|
668 |
assert(index >= vmSymbols::FIRST_SID && index < vmSymbols::SID_LIMIT, "oob"); |
|
669 |
return _shared_ci_symbols[index]; |
|
670 |
} |
|
671 |
||
672 |
// ------------------------------------------------------------------ |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
673 |
// ciObjectFactory::metadata_do |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
674 |
void ciObjectFactory::metadata_do(void f(Metadata*)) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
675 |
if (_ci_metadata == NULL) return; |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
676 |
for (int j = 0; j< _ci_metadata->length(); j++) { |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
677 |
Metadata* o = _ci_metadata->at(j)->constant_encoding(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
678 |
f(o); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
679 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
680 |
} |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
681 |
|
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
682 |
// ------------------------------------------------------------------ |
1 | 683 |
// ciObjectFactory::print_contents_impl |
684 |
void ciObjectFactory::print_contents_impl() { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
685 |
int len = _ci_metadata->length(); |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
686 |
tty->print_cr("ciObjectFactory (%d) meta data contents:", len); |
1 | 687 |
for (int i=0; i<len; i++) { |
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
688 |
_ci_metadata->at(i)->print(); |
1 | 689 |
tty->cr(); |
690 |
} |
|
691 |
} |
|
692 |
||
693 |
// ------------------------------------------------------------------ |
|
694 |
// ciObjectFactory::print_contents |
|
695 |
void ciObjectFactory::print_contents() { |
|
696 |
print(); |
|
697 |
tty->cr(); |
|
698 |
GUARDED_VM_ENTRY(print_contents_impl();) |
|
699 |
} |
|
700 |
||
701 |
// ------------------------------------------------------------------ |
|
702 |
// ciObjectFactory::print |
|
703 |
// |
|
704 |
// Print debugging information about the object factory |
|
705 |
void ciObjectFactory::print() { |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
706 |
tty->print("<ciObjectFactory oops=%d metadata=%d unloaded_methods=%d unloaded_instances=%d unloaded_klasses=%d>", |
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13391
diff
changeset
|
707 |
_non_perm_count, _ci_metadata->length(), _unloaded_methods->length(), |
5882 | 708 |
_unloaded_instances->length(), |
1 | 709 |
_unloaded_klasses->length()); |
710 |
} |