author | dlong |
Thu, 19 Oct 2017 19:23:48 -0700 | |
changeset 47668 | fc4cfca10556 |
parent 47216 | 71c04702a3d5 |
child 47798 | 9fe9292f5931 |
permissions | -rw-r--r-- |
42650 | 1 |
/* |
46260
5de61384fba6
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42650
diff
changeset
|
2 |
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. |
42650 | 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 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
24 |
#include "precompiled.hpp" |
|
25 |
||
26 |
#include "aot/aotCodeHeap.hpp" |
|
27 |
#include "aot/aotLoader.hpp" |
|
43405
1fab8e6866d7
8168792: [AOT] problems in MethodHandle with aot-compiled java.base
iveresov
parents:
42650
diff
changeset
|
28 |
#include "classfile/javaAssertions.hpp" |
42650 | 29 |
#include "gc/g1/heapRegion.hpp" |
30 |
#include "gc/shared/gcLocker.hpp" |
|
31 |
#include "interpreter/abstractInterpreter.hpp" |
|
32 |
#include "jvmci/compilerRuntime.hpp" |
|
33 |
#include "jvmci/jvmciRuntime.hpp" |
|
34 |
#include "oops/method.hpp" |
|
35 |
#include "runtime/os.hpp" |
|
36 |
#include "runtime/sharedRuntime.hpp" |
|
37 |
#include "runtime/vm_operations.hpp" |
|
38 |
||
39 |
bool AOTLib::_narrow_oop_shift_initialized = false; |
|
40 |
int AOTLib::_narrow_oop_shift = 0; |
|
41 |
int AOTLib::_narrow_klass_shift = 0; |
|
42 |
||
43 |
address AOTLib::load_symbol(const char *name) { |
|
46260
5de61384fba6
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42650
diff
changeset
|
44 |
address symbol = (address) os::dll_lookup(_dl_handle, name); |
42650 | 45 |
if (symbol == NULL) { |
46 |
tty->print_cr("Shared file %s error: missing %s", _name, name); |
|
47 |
vm_exit(1); |
|
48 |
} |
|
49 |
return symbol; |
|
50 |
} |
|
51 |
||
52 |
Klass* AOTCodeHeap::get_klass_from_got(const char* klass_name, int klass_len, const Method* method) { |
|
53 |
AOTKlassData* klass_data = (AOTKlassData*)_lib->load_symbol(klass_name); |
|
46949 | 54 |
Klass* k = (Klass*)_klasses_got[klass_data->_got_index]; |
42650 | 55 |
if (k == NULL) { |
56 |
Thread* thread = Thread::current(); |
|
57 |
k = lookup_klass(klass_name, klass_len, method, thread); |
|
58 |
// Note, exceptions are cleared. |
|
59 |
if (k == NULL) { |
|
60 |
fatal("Shared file %s error: klass %s should be resolved already", _lib->name(), klass_name); |
|
61 |
vm_exit(1); |
|
62 |
} |
|
47668 | 63 |
// Patch now to avoid extra runtime lookup |
46949 | 64 |
_klasses_got[klass_data->_got_index] = k; |
47668 | 65 |
if (k->is_instance_klass()) { |
66 |
InstanceKlass* ik = InstanceKlass::cast(k); |
|
67 |
if (ik->is_initialized()) { |
|
68 |
_klasses_got[klass_data->_got_index - 1] = ik; |
|
69 |
} |
|
70 |
} |
|
42650 | 71 |
} |
72 |
return k; |
|
73 |
} |
|
74 |
||
75 |
Klass* AOTCodeHeap::lookup_klass(const char* name, int len, const Method* method, Thread* thread) { |
|
76 |
ResourceMark rm(thread); |
|
77 |
assert(method != NULL, "incorrect call parameter"); |
|
78 |
methodHandle caller(thread, (Method*)method); |
|
79 |
||
80 |
// Use class loader of aot method. |
|
81 |
Handle loader(thread, caller->method_holder()->class_loader()); |
|
82 |
Handle protection_domain(thread, caller->method_holder()->protection_domain()); |
|
83 |
||
84 |
// Ignore wrapping L and ; |
|
85 |
if (name[0] == 'L') { |
|
86 |
assert(len > 2, "small name %s", name); |
|
87 |
name++; |
|
88 |
len -= 2; |
|
89 |
} |
|
90 |
TempNewSymbol sym = SymbolTable::probe(name, len); |
|
91 |
if (sym == NULL) { |
|
92 |
log_debug(aot, class, resolve)("Probe failed for AOT class %s", name); |
|
93 |
return NULL; |
|
94 |
} |
|
95 |
Klass* k = SystemDictionary::find_instance_or_array_klass(sym, loader, protection_domain, thread); |
|
96 |
assert(!thread->has_pending_exception(), "should not throw"); |
|
97 |
||
98 |
if (k != NULL) { |
|
99 |
log_info(aot, class, resolve)("%s %s (lookup)", caller->method_holder()->external_name(), k->external_name()); |
|
100 |
} |
|
101 |
return k; |
|
102 |
} |
|
103 |
||
104 |
void AOTLib::handle_config_error(const char* format, ...) { |
|
105 |
if (PrintAOT) { |
|
106 |
va_list ap; |
|
107 |
va_start(ap, format); |
|
108 |
tty->vprint_cr(format, ap); |
|
109 |
va_end(ap); |
|
110 |
} |
|
111 |
if (UseAOTStrictLoading) { |
|
112 |
vm_exit(1); |
|
113 |
} |
|
114 |
_valid = false; |
|
115 |
} |
|
116 |
||
117 |
void AOTLib::verify_flag(bool aot_flag, bool flag, const char* name) { |
|
118 |
if (_valid && aot_flag != flag) { |
|
119 |
handle_config_error("Shared file %s error: %s has different value '%s' from current '%s'", _name, name , (aot_flag ? "true" : "false"), (flag ? "true" : "false")); |
|
120 |
} |
|
121 |
} |
|
122 |
||
123 |
void AOTLib::verify_flag(int aot_flag, int flag, const char* name) { |
|
124 |
if (_valid && aot_flag != flag) { |
|
125 |
handle_config_error("Shared file %s error: %s has different value '%d' from current '%d'", _name, name , aot_flag, flag); |
|
126 |
} |
|
127 |
} |
|
128 |
||
129 |
void AOTLib::verify_config() { |
|
130 |
GrowableArray<AOTLib*>* libraries = AOTLoader::libraries(); |
|
131 |
for (GrowableArrayIterator<AOTLib*> lib = libraries->begin(); lib != libraries->end(); ++lib) { |
|
132 |
if ((*lib)->_config == _config) { |
|
133 |
handle_config_error("AOT library %s already loaded.", (*lib)->_name); |
|
134 |
return; |
|
135 |
} |
|
136 |
} |
|
137 |
||
138 |
if (_header->_version != AOTHeader::AOT_SHARED_VERSION) { |
|
139 |
handle_config_error("Invalid version of the shared file %s. Expected %d but was %d", _name, _header->_version, AOTHeader::AOT_SHARED_VERSION); |
|
140 |
return; |
|
141 |
} |
|
142 |
||
143 |
const char* aot_jvm_version = (const char*)_header + _header->_jvm_version_offset + 2; |
|
144 |
if (strcmp(aot_jvm_version, VM_Version::jre_release_version()) != 0) { |
|
145 |
handle_config_error("JVM version '%s' recorded in the shared file %s does not match current version '%s'", aot_jvm_version, _name, VM_Version::jre_release_version()); |
|
146 |
return; |
|
147 |
} |
|
148 |
||
149 |
// Debug VM has different layout of runtime and metadata structures |
|
150 |
#ifdef ASSERT |
|
151 |
verify_flag(_config->_debug_VM, true, "Debug VM version"); |
|
152 |
#else |
|
153 |
verify_flag(!(_config->_debug_VM), true, "Product VM version"); |
|
154 |
#endif |
|
155 |
// Check configuration size |
|
156 |
verify_flag(_config->_config_size, AOTConfiguration::CONFIG_SIZE, "AOT configuration size"); |
|
157 |
||
158 |
// Check flags |
|
159 |
verify_flag(_config->_useCompressedOops, UseCompressedOops, "UseCompressedOops"); |
|
160 |
verify_flag(_config->_useCompressedClassPointers, UseCompressedClassPointers, "UseCompressedClassPointers"); |
|
161 |
verify_flag(_config->_useG1GC, UseG1GC, "UseG1GC"); |
|
162 |
verify_flag(_config->_useTLAB, UseTLAB, "UseTLAB"); |
|
163 |
verify_flag(_config->_useBiasedLocking, UseBiasedLocking, "UseBiasedLocking"); |
|
164 |
verify_flag(_config->_objectAlignment, ObjectAlignmentInBytes, "ObjectAlignmentInBytes"); |
|
165 |
verify_flag(_config->_contendedPaddingWidth, ContendedPaddingWidth, "ContendedPaddingWidth"); |
|
166 |
verify_flag(_config->_fieldsAllocationStyle, FieldsAllocationStyle, "FieldsAllocationStyle"); |
|
167 |
verify_flag(_config->_compactFields, CompactFields, "CompactFields"); |
|
168 |
verify_flag(_config->_enableContended, EnableContended, "EnableContended"); |
|
169 |
verify_flag(_config->_restrictContended, RestrictContended, "RestrictContended"); |
|
170 |
||
171 |
if (!TieredCompilation && _config->_tieredAOT) { |
|
172 |
handle_config_error("Shared file %s error: Expected to run with tiered compilation on", _name); |
|
173 |
} |
|
174 |
||
175 |
// Shifts are static values which initialized by 0 until java heap initialization. |
|
176 |
// AOT libs are loaded before heap initialized so shift values are not set. |
|
177 |
// It is okay since ObjectAlignmentInBytes flag which defines shifts value is set before AOT libs are loaded. |
|
178 |
// Set shifts value based on first AOT library config. |
|
179 |
if (UseCompressedOops && _valid) { |
|
180 |
if (!_narrow_oop_shift_initialized) { |
|
181 |
_narrow_oop_shift = _config->_narrowOopShift; |
|
182 |
if (UseCompressedClassPointers) { // It is set only if UseCompressedOops is set |
|
183 |
_narrow_klass_shift = _config->_narrowKlassShift; |
|
184 |
} |
|
185 |
_narrow_oop_shift_initialized = true; |
|
186 |
} else { |
|
187 |
verify_flag(_config->_narrowOopShift, _narrow_oop_shift, "aot_config->_narrowOopShift"); |
|
188 |
if (UseCompressedClassPointers) { // It is set only if UseCompressedOops is set |
|
189 |
verify_flag(_config->_narrowKlassShift, _narrow_klass_shift, "aot_config->_narrowKlassShift"); |
|
190 |
} |
|
191 |
} |
|
192 |
} |
|
193 |
} |
|
194 |
||
195 |
AOTLib::~AOTLib() { |
|
196 |
free((void*) _name); |
|
197 |
} |
|
198 |
||
199 |
AOTCodeHeap::~AOTCodeHeap() { |
|
200 |
if (_classes != NULL) { |
|
201 |
FREE_C_HEAP_ARRAY(AOTClass, _classes); |
|
202 |
} |
|
203 |
if (_code_to_aot != NULL) { |
|
204 |
FREE_C_HEAP_ARRAY(CodeToAMethod, _code_to_aot); |
|
205 |
} |
|
206 |
} |
|
207 |
||
208 |
AOTLib::AOTLib(void* handle, const char* name, int dso_id) : _valid(true), _dl_handle(handle), _dso_id(dso_id) { |
|
209 |
_name = (const char*) strdup(name); |
|
210 |
||
211 |
// Verify that VM runs with the same parameters as AOT tool. |
|
46949 | 212 |
_config = (AOTConfiguration*) load_symbol("A.config"); |
213 |
_header = (AOTHeader*) load_symbol("A.header"); |
|
42650 | 214 |
|
215 |
verify_config(); |
|
216 |
||
217 |
if (!_valid && PrintAOT) { |
|
218 |
tty->print("%7d ", (int) tty->time_stamp().milliseconds()); |
|
219 |
tty->print_cr("%4d skipped %s aot library", _dso_id, _name); |
|
220 |
} |
|
221 |
} |
|
222 |
||
223 |
AOTCodeHeap::AOTCodeHeap(AOTLib* lib) : |
|
224 |
CodeHeap("CodeHeap 'AOT'", CodeBlobType::AOT), _lib(lib), _classes(NULL), _code_to_aot(NULL) { |
|
225 |
assert(_lib->is_valid(), "invalid library"); |
|
226 |
||
227 |
_lib_symbols_initialized = false; |
|
228 |
_aot_id = 0; |
|
229 |
||
230 |
_class_count = _lib->header()->_class_count; |
|
231 |
_method_count = _lib->header()->_method_count; |
|
232 |
||
233 |
// Collect metaspace info: names -> address in .got section |
|
46949 | 234 |
_metaspace_names = (const char*) _lib->load_symbol("A.meta.names"); |
235 |
_method_metadata = (address) _lib->load_symbol("A.meth.metadata"); |
|
236 |
_methods_offsets = (address) _lib->load_symbol("A.meth.offsets"); |
|
237 |
_klasses_offsets = (address) _lib->load_symbol("A.kls.offsets"); |
|
238 |
_dependencies = (address) _lib->load_symbol("A.kls.dependencies"); |
|
239 |
_code_space = (address) _lib->load_symbol("A.text"); |
|
42650 | 240 |
|
241 |
// First cell is number of elements. |
|
46949 | 242 |
_klasses_got = (Metadata**) _lib->load_symbol("A.kls.got"); |
243 |
_klasses_got_size = _lib->header()->_klasses_got_size; |
|
42650 | 244 |
|
46949 | 245 |
_metadata_got = (Metadata**) _lib->load_symbol("A.meta.got"); |
42650 | 246 |
_metadata_got_size = _lib->header()->_metadata_got_size; |
247 |
||
46949 | 248 |
_oop_got = (oop*) _lib->load_symbol("A.oop.got"); |
42650 | 249 |
_oop_got_size = _lib->header()->_oop_got_size; |
250 |
||
251 |
// Collect stubs info |
|
46949 | 252 |
_stubs_offsets = (int*) _lib->load_symbol("A.stubs.offsets"); |
42650 | 253 |
|
254 |
// code segments table |
|
46949 | 255 |
_code_segments = (address) _lib->load_symbol("A.code.segments"); |
42650 | 256 |
|
257 |
// method state |
|
46949 | 258 |
_method_state = (jlong*) _lib->load_symbol("A.meth.state"); |
42650 | 259 |
|
260 |
// Create a table for mapping classes |
|
261 |
_classes = NEW_C_HEAP_ARRAY(AOTClass, _class_count, mtCode); |
|
262 |
memset(_classes, 0, _class_count * sizeof(AOTClass)); |
|
263 |
||
264 |
// Create table for searching AOTCompiledMethod based on pc. |
|
265 |
_code_to_aot = NEW_C_HEAP_ARRAY(CodeToAMethod, _method_count, mtCode); |
|
266 |
memset(_code_to_aot, 0, _method_count * sizeof(CodeToAMethod)); |
|
267 |
||
268 |
_memory.set_low_boundary((char *)_code_space); |
|
269 |
_memory.set_high_boundary((char *)_code_space); |
|
270 |
_memory.set_low((char *)_code_space); |
|
271 |
_memory.set_high((char *)_code_space); |
|
272 |
||
273 |
_segmap.set_low_boundary((char *)_code_segments); |
|
274 |
_segmap.set_low((char *)_code_segments); |
|
275 |
||
276 |
_log2_segment_size = exact_log2(_lib->config()->_codeSegmentSize); |
|
277 |
||
278 |
// Register aot stubs |
|
279 |
register_stubs(); |
|
280 |
||
281 |
if (PrintAOT || (PrintCompilation && PrintAOT)) { |
|
282 |
tty->print("%7d ", (int) tty->time_stamp().milliseconds()); |
|
283 |
tty->print_cr("%4d loaded %s aot library", _lib->id(), _lib->name()); |
|
284 |
} |
|
285 |
} |
|
286 |
||
287 |
void AOTCodeHeap::publish_aot(const methodHandle& mh, AOTMethodData* method_data, int code_id) { |
|
288 |
// The method may be explicitly excluded by the user. |
|
289 |
// Or Interpreter uses an intrinsic for this method. |
|
290 |
if (CompilerOracle::should_exclude(mh) || !AbstractInterpreter::can_be_compiled(mh)) { |
|
291 |
return; |
|
292 |
} |
|
293 |
||
294 |
address code = method_data->_code; |
|
295 |
const char* name = method_data->_name; |
|
296 |
aot_metadata* meta = method_data->_meta; |
|
297 |
||
298 |
if (meta->scopes_pcs_begin() == meta->scopes_pcs_end()) { |
|
299 |
// When the AOT compiler compiles something big we fail to generate metadata |
|
300 |
// in CodeInstaller::gather_metadata. In that case the scopes_pcs_begin == scopes_pcs_end. |
|
301 |
// In all successful cases we always have 2 entries of scope pcs. |
|
43416
f8c241512446
8171082: [AOT] AOT'd SystemModules.modules() fails to load when too large
rbackman
parents:
43405
diff
changeset
|
302 |
log_info(aot, class, resolve)("Failed to load %s (no metadata available)", mh->name_and_sig_as_C_string()); |
f8c241512446
8171082: [AOT] AOT'd SystemModules.modules() fails to load when too large
rbackman
parents:
43405
diff
changeset
|
303 |
_code_to_aot[code_id]._state = invalid; |
42650 | 304 |
return; |
305 |
} |
|
306 |
||
307 |
jlong* state_adr = &_method_state[code_id]; |
|
308 |
address metadata_table = method_data->_metadata_table; |
|
309 |
int metadata_size = method_data->_metadata_size; |
|
310 |
assert(code_id < _method_count, "sanity"); |
|
311 |
_aot_id++; |
|
312 |
||
313 |
#ifdef ASSERT |
|
314 |
if (_aot_id > CIStop || _aot_id < CIStart) { |
|
315 |
// Skip compilation |
|
316 |
return; |
|
317 |
} |
|
318 |
#endif |
|
319 |
// Check one more time. |
|
320 |
if (_code_to_aot[code_id]._state == invalid) { |
|
321 |
return; |
|
322 |
} |
|
323 |
AOTCompiledMethod *aot = new AOTCompiledMethod(code, mh(), meta, metadata_table, metadata_size, state_adr, this, name, code_id, _aot_id); |
|
324 |
assert(_code_to_aot[code_id]._aot == NULL, "should be not initialized"); |
|
325 |
_code_to_aot[code_id]._aot = aot; // Should set this first |
|
46958
a13bd8c6b7a2
8186166: Generalize Atomic::cmpxchg with templates
eosterlund
parents:
46949
diff
changeset
|
326 |
if (Atomic::cmpxchg(in_use, &_code_to_aot[code_id]._state, not_set) != not_set) { |
42650 | 327 |
_code_to_aot[code_id]._aot = NULL; // Clean |
328 |
} else { // success |
|
329 |
// Publish method |
|
330 |
#ifdef TIERED |
|
331 |
mh->set_aot_code(aot); |
|
332 |
#endif |
|
333 |
Method::set_code(mh, aot); |
|
334 |
if (PrintAOT || (PrintCompilation && PrintAOT)) { |
|
335 |
aot->print_on(tty, NULL); |
|
336 |
} |
|
337 |
// Publish oop only after we are visible to CompiledMethodIterator |
|
338 |
aot->set_oop(mh()->method_holder()->klass_holder()); |
|
339 |
} |
|
340 |
} |
|
341 |
||
342 |
void AOTCodeHeap::link_primitive_array_klasses() { |
|
343 |
ResourceMark rm; |
|
344 |
for (int i = T_BOOLEAN; i <= T_CONFLICT; i++) { |
|
345 |
BasicType t = (BasicType)i; |
|
346 |
if (is_java_primitive(t)) { |
|
347 |
const Klass* arr_klass = Universe::typeArrayKlassObj(t); |
|
46260
5de61384fba6
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42650
diff
changeset
|
348 |
AOTKlassData* klass_data = (AOTKlassData*) os::dll_lookup(_lib->dl_handle(), arr_klass->signature_name()); |
42650 | 349 |
if (klass_data != NULL) { |
350 |
// Set both GOT cells, resolved and initialized klass pointers. |
|
351 |
// _got_index points to second cell - resolved klass pointer. |
|
46949 | 352 |
_klasses_got[klass_data->_got_index-1] = (Metadata*)arr_klass; // Initialized |
353 |
_klasses_got[klass_data->_got_index ] = (Metadata*)arr_klass; // Resolved |
|
42650 | 354 |
if (PrintAOT) { |
355 |
tty->print_cr("[Found %s in %s]", arr_klass->internal_name(), _lib->name()); |
|
356 |
} |
|
357 |
} |
|
358 |
} |
|
359 |
} |
|
360 |
} |
|
361 |
||
362 |
void AOTCodeHeap::register_stubs() { |
|
363 |
int stubs_count = _stubs_offsets[0]; // contains number |
|
364 |
_stubs_offsets++; |
|
365 |
AOTMethodOffsets* stub_offsets = (AOTMethodOffsets*)_stubs_offsets; |
|
366 |
for (int i = 0; i < stubs_count; ++i) { |
|
367 |
const char* stub_name = _metaspace_names + stub_offsets[i]._name_offset; |
|
368 |
address entry = _code_space + stub_offsets[i]._code_offset; |
|
369 |
aot_metadata* meta = (aot_metadata *) (_method_metadata + stub_offsets[i]._meta_offset); |
|
370 |
address metadata_table = (address)_metadata_got + stub_offsets[i]._metadata_got_offset; |
|
371 |
int metadata_size = stub_offsets[i]._metadata_got_size; |
|
372 |
int code_id = stub_offsets[i]._code_id; |
|
373 |
assert(code_id < _method_count, "sanity"); |
|
374 |
jlong* state_adr = &_method_state[code_id]; |
|
375 |
int len = build_u2_from((address)stub_name); |
|
376 |
stub_name += 2; |
|
377 |
char* full_name = NEW_C_HEAP_ARRAY(char, len+5, mtCode); |
|
378 |
if (full_name == NULL) { // No memory? |
|
379 |
break; |
|
380 |
} |
|
381 |
memcpy(full_name, "AOT ", 4); |
|
382 |
memcpy(full_name+4, stub_name, len); |
|
383 |
full_name[len+4] = 0; |
|
384 |
guarantee(_code_to_aot[code_id]._state != invalid, "stub %s can't be invalidated", full_name); |
|
385 |
AOTCompiledMethod* aot = new AOTCompiledMethod(entry, NULL, meta, metadata_table, metadata_size, state_adr, this, full_name, code_id, i); |
|
386 |
assert(_code_to_aot[code_id]._aot == NULL, "should be not initialized"); |
|
387 |
_code_to_aot[code_id]._aot = aot; |
|
46958
a13bd8c6b7a2
8186166: Generalize Atomic::cmpxchg with templates
eosterlund
parents:
46949
diff
changeset
|
388 |
if (Atomic::cmpxchg(in_use, &_code_to_aot[code_id]._state, not_set) != not_set) { |
42650 | 389 |
fatal("stab '%s' code state is %d", full_name, _code_to_aot[code_id]._state); |
390 |
} |
|
391 |
// Adjust code buffer boundaries only for stubs because they are last in the buffer. |
|
392 |
adjust_boundaries(aot); |
|
393 |
if (PrintAOT && Verbose) { |
|
394 |
aot->print_on(tty, NULL); |
|
395 |
} |
|
396 |
} |
|
397 |
} |
|
398 |
||
399 |
#define SET_AOT_GLOBAL_SYMBOL_VALUE(AOTSYMNAME, AOTSYMTYPE, VMSYMVAL) \ |
|
400 |
{ \ |
|
46260
5de61384fba6
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42650
diff
changeset
|
401 |
AOTSYMTYPE * adr = (AOTSYMTYPE *) os::dll_lookup(_lib->dl_handle(), AOTSYMNAME); \ |
5de61384fba6
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42650
diff
changeset
|
402 |
/* Check for a lookup error */ \ |
5de61384fba6
8172670: AOT Platform Support for Windows and Mac OS X x64
bobv
parents:
42650
diff
changeset
|
403 |
guarantee(adr != NULL, "AOT Symbol not found %s", AOTSYMNAME); \ |
42650 | 404 |
*adr = (AOTSYMTYPE) VMSYMVAL; \ |
405 |
} |
|
406 |
||
407 |
void AOTCodeHeap::link_graal_runtime_symbols() { |
|
408 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_monitorenter", address, JVMCIRuntime::monitorenter); |
|
409 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_monitorexit", address, JVMCIRuntime::monitorexit); |
|
410 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_log_object", address, JVMCIRuntime::log_object); |
|
411 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_log_printf", address, JVMCIRuntime::log_printf); |
|
412 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_log_primitive", address, JVMCIRuntime::log_primitive); |
|
413 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_instance", address, JVMCIRuntime::new_instance); |
|
414 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_array", address, JVMCIRuntime::new_array); |
|
415 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_new_multi_array", address, JVMCIRuntime::new_multi_array); |
|
416 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_array", address, JVMCIRuntime::dynamic_new_array); |
|
417 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_validate_object", address, JVMCIRuntime::validate_object); |
|
418 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_write_barrier_pre", address, JVMCIRuntime::write_barrier_pre); |
|
419 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_identity_hash_code", address, JVMCIRuntime::identity_hash_code); |
|
420 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_write_barrier_post", address, JVMCIRuntime::write_barrier_post); |
|
421 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_dynamic_new_instance", address, JVMCIRuntime::dynamic_new_instance); |
|
422 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_thread_is_interrupted", address, JVMCIRuntime::thread_is_interrupted); |
|
423 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_exception_handler_for_pc", address, JVMCIRuntime::exception_handler_for_pc); |
|
424 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_test_deoptimize_call_int", address, JVMCIRuntime::test_deoptimize_call_int); |
|
425 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_throw_and_post_jvmti_exception", address, JVMCIRuntime::throw_and_post_jvmti_exception); |
|
426 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_throw_klass_external_name_exception", address, JVMCIRuntime::throw_klass_external_name_exception); |
|
427 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_throw_class_cast_exception", address, JVMCIRuntime::throw_class_cast_exception); |
|
428 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_vm_message", address, JVMCIRuntime::vm_message); |
|
429 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_jvmci_runtime_vm_error", address, JVMCIRuntime::vm_error); |
|
430 |
} |
|
431 |
||
432 |
void AOTCodeHeap::link_shared_runtime_symbols() { |
|
433 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_resolve_static_entry", address, SharedRuntime::get_resolve_static_call_stub()); |
|
434 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_resolve_virtual_entry", address, SharedRuntime::get_resolve_virtual_call_stub()); |
|
435 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_resolve_opt_virtual_entry", address, SharedRuntime::get_resolve_opt_virtual_call_stub()); |
|
436 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_deopt_blob_unpack", address, SharedRuntime::deopt_blob()->unpack()); |
|
437 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_deopt_blob_uncommon_trap", address, SharedRuntime::deopt_blob()->uncommon_trap()); |
|
438 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_ic_miss_stub", address, SharedRuntime::get_ic_miss_stub()); |
|
439 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_handle_wrong_method_stub", address, SharedRuntime::get_handle_wrong_method_stub()); |
|
440 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_exception_handler_for_return_address", address, SharedRuntime::exception_handler_for_return_address); |
|
441 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_register_finalizer", address, SharedRuntime::register_finalizer); |
|
442 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_OSR_migration_end", address, SharedRuntime::OSR_migration_end); |
|
47668 | 443 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_resolve_dynamic_invoke", address, CompilerRuntime::resolve_dynamic_invoke); |
42650 | 444 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_resolve_string_by_symbol", address, CompilerRuntime::resolve_string_by_symbol); |
445 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_resolve_klass_by_symbol", address, CompilerRuntime::resolve_klass_by_symbol); |
|
446 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_resolve_method_by_symbol_and_load_counters", address, CompilerRuntime::resolve_method_by_symbol_and_load_counters); |
|
447 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_initialize_klass_by_symbol", address, CompilerRuntime::initialize_klass_by_symbol); |
|
448 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_invocation_event", address, CompilerRuntime::invocation_event); |
|
449 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_backedge_event", address, CompilerRuntime::backedge_event); |
|
450 |
||
451 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dpow", address, SharedRuntime::dpow); |
|
452 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dexp", address, SharedRuntime::dexp); |
|
453 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dcos", address, SharedRuntime::dcos); |
|
454 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dsin", address, SharedRuntime::dsin); |
|
455 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dtan", address, SharedRuntime::dtan); |
|
456 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dlog", address, SharedRuntime::dlog); |
|
457 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_shared_runtime_dlog10", address, SharedRuntime::dlog10); |
|
458 |
} |
|
459 |
||
460 |
void AOTCodeHeap::link_stub_routines_symbols() { |
|
461 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jbyte_arraycopy", address, StubRoutines::_jbyte_arraycopy); |
|
462 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jshort_arraycopy", address, StubRoutines::_jshort_arraycopy); |
|
463 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jint_arraycopy", address, StubRoutines::_jint_arraycopy); |
|
464 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jlong_arraycopy", address, StubRoutines::_jlong_arraycopy); |
|
465 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_oop_arraycopy", address, StubRoutines::_oop_arraycopy); |
|
466 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_oop_arraycopy_uninit", address, StubRoutines::_oop_arraycopy_uninit); |
|
467 |
||
468 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jbyte_disjoint_arraycopy", address, StubRoutines::_jbyte_disjoint_arraycopy); |
|
469 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jshort_disjoint_arraycopy", address, StubRoutines::_jshort_disjoint_arraycopy); |
|
470 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jint_disjoint_arraycopy", address, StubRoutines::_jint_disjoint_arraycopy); |
|
471 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_jlong_disjoint_arraycopy", address, StubRoutines::_jlong_disjoint_arraycopy); |
|
472 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_oop_disjoint_arraycopy", address, StubRoutines::_oop_disjoint_arraycopy); |
|
473 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_oop_disjoint_arraycopy_uninit", address, StubRoutines::_oop_disjoint_arraycopy_uninit); |
|
474 |
||
475 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jbyte_arraycopy", address, StubRoutines::_arrayof_jbyte_arraycopy); |
|
476 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jshort_arraycopy", address, StubRoutines::_arrayof_jshort_arraycopy); |
|
477 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jint_arraycopy", address, StubRoutines::_arrayof_jint_arraycopy); |
|
478 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jlong_arraycopy", address, StubRoutines::_arrayof_jlong_arraycopy); |
|
479 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_oop_arraycopy", address, StubRoutines::_arrayof_oop_arraycopy); |
|
480 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_oop_arraycopy_uninit", address, StubRoutines::_arrayof_oop_arraycopy_uninit); |
|
481 |
||
482 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jbyte_disjoint_arraycopy", address, StubRoutines::_arrayof_jbyte_disjoint_arraycopy); |
|
483 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jshort_disjoint_arraycopy", address, StubRoutines::_arrayof_jshort_disjoint_arraycopy); |
|
484 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jint_disjoint_arraycopy", address, StubRoutines::_arrayof_jint_disjoint_arraycopy); |
|
485 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_jlong_disjoint_arraycopy", address, StubRoutines::_arrayof_jlong_disjoint_arraycopy); |
|
486 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_oop_disjoint_arraycopy", address, StubRoutines::_arrayof_oop_disjoint_arraycopy); |
|
487 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_arrayof_oop_disjoint_arraycopy_uninit", address, StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit); |
|
488 |
||
47084 | 489 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_unsafe_arraycopy", address, StubRoutines::_unsafe_arraycopy); |
490 |
||
42650 | 491 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_checkcast_arraycopy", address, StubRoutines::_checkcast_arraycopy); |
492 |
||
493 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_aescrypt_encryptBlock", address, StubRoutines::_aescrypt_encryptBlock); |
|
494 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_aescrypt_decryptBlock", address, StubRoutines::_aescrypt_decryptBlock); |
|
495 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_cipherBlockChaining_encryptAESCrypt", address, StubRoutines::_cipherBlockChaining_encryptAESCrypt); |
|
496 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_cipherBlockChaining_decryptAESCrypt", address, StubRoutines::_cipherBlockChaining_decryptAESCrypt); |
|
497 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_update_bytes_crc32", address, StubRoutines::_updateBytesCRC32); |
|
498 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_crc_table_adr", address, StubRoutines::_crc_table_adr); |
|
499 |
||
500 |
||
501 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_sha1_implCompress", address, StubRoutines::_sha1_implCompress); |
|
502 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_sha1_implCompressMB", address, StubRoutines::_sha1_implCompressMB); |
|
503 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_sha256_implCompress", address, StubRoutines::_sha256_implCompress); |
|
504 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_sha256_implCompressMB", address, StubRoutines::_sha256_implCompressMB); |
|
505 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_sha512_implCompress", address, StubRoutines::_sha512_implCompress); |
|
506 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_sha512_implCompressMB", address, StubRoutines::_sha512_implCompressMB); |
|
507 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_multiplyToLen", address, StubRoutines::_multiplyToLen); |
|
508 |
||
509 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_counterMode_AESCrypt", address, StubRoutines::_counterMode_AESCrypt); |
|
510 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_ghash_processBlocks", address, StubRoutines::_ghash_processBlocks); |
|
511 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_crc32c_table_addr", address, StubRoutines::_crc32c_table_addr); |
|
512 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_updateBytesCRC32C", address, StubRoutines::_updateBytesCRC32C); |
|
513 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_updateBytesAdler32", address, StubRoutines::_updateBytesAdler32); |
|
514 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_squareToLen", address, StubRoutines::_squareToLen); |
|
515 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_mulAdd", address, StubRoutines::_mulAdd); |
|
516 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_montgomeryMultiply", address, StubRoutines::_montgomeryMultiply); |
|
517 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_montgomerySquare", address, StubRoutines::_montgomerySquare); |
|
518 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_vectorizedMismatch", address, StubRoutines::_vectorizedMismatch); |
|
519 |
||
520 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_stub_routines_throw_delayed_StackOverflowError_entry", address, StubRoutines::_throw_delayed_StackOverflowError_entry); |
|
521 |
||
522 |
} |
|
523 |
||
524 |
void AOTCodeHeap::link_os_symbols() { |
|
525 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_os_javaTimeMillis", address, os::javaTimeMillis); |
|
526 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_os_javaTimeNanos", address, os::javaTimeNanos); |
|
527 |
} |
|
528 |
||
529 |
/* |
|
530 |
* Link any global symbols in precompiled DSO with dlopen() _dl_handle |
|
531 |
* dso_handle. |
|
532 |
*/ |
|
533 |
||
534 |
void AOTCodeHeap::link_global_lib_symbols() { |
|
535 |
if (!_lib_symbols_initialized) { |
|
536 |
_lib_symbols_initialized = true; |
|
537 |
||
538 |
CollectedHeap* heap = Universe::heap(); |
|
539 |
CardTableModRefBS* ct = (CardTableModRefBS*)(heap->barrier_set()); |
|
540 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_card_table_address", address, ct->byte_map_base); |
|
541 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_heap_top_address", address, (heap->supports_inline_contig_alloc() ? heap->top_addr() : NULL)); |
|
542 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_heap_end_address", address, (heap->supports_inline_contig_alloc() ? heap->end_addr() : NULL)); |
|
543 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_polling_page", address, os::get_polling_page()); |
|
544 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_narrow_klass_base_address", address, Universe::narrow_klass_base()); |
|
43435 | 545 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_narrow_oop_base_address", address, Universe::narrow_oop_base()); |
42650 | 546 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_log_of_heap_region_grain_bytes", int, HeapRegion::LogOfHRGrainBytes); |
547 |
SET_AOT_GLOBAL_SYMBOL_VALUE("_aot_inline_contiguous_allocation_supported", bool, heap->supports_inline_contig_alloc()); |
|
548 |
link_shared_runtime_symbols(); |
|
549 |
link_stub_routines_symbols(); |
|
550 |
link_os_symbols(); |
|
551 |
link_graal_runtime_symbols(); |
|
552 |
||
553 |
// Link primitive array klasses. |
|
554 |
link_primitive_array_klasses(); |
|
555 |
} |
|
556 |
} |
|
557 |
||
558 |
#ifndef PRODUCT |
|
559 |
int AOTCodeHeap::klasses_seen = 0; |
|
560 |
int AOTCodeHeap::aot_klasses_found = 0; |
|
561 |
int AOTCodeHeap::aot_klasses_fp_miss = 0; |
|
562 |
int AOTCodeHeap::aot_klasses_cl_miss = 0; |
|
563 |
int AOTCodeHeap::aot_methods_found = 0; |
|
564 |
||
565 |
void AOTCodeHeap::print_statistics() { |
|
566 |
tty->print_cr("Classes seen: %d AOT classes found: %d AOT methods found: %d", klasses_seen, aot_klasses_found, aot_methods_found); |
|
567 |
tty->print_cr("AOT fingerprint mismatches: %d AOT class loader mismatches: %d", aot_klasses_fp_miss, aot_klasses_cl_miss); |
|
568 |
} |
|
569 |
#endif |
|
570 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
571 |
Method* AOTCodeHeap::find_method(Klass* klass, Thread* thread, const char* method_name) { |
42650 | 572 |
int method_name_len = build_u2_from((address)method_name); |
573 |
method_name += 2; |
|
574 |
const char* signature_name = method_name + method_name_len; |
|
575 |
int signature_name_len = build_u2_from((address)signature_name); |
|
576 |
signature_name += 2; |
|
577 |
// The class should have been loaded so the method and signature should already be |
|
578 |
// in the symbol table. If they're not there, the method doesn't exist. |
|
579 |
TempNewSymbol name = SymbolTable::probe(method_name, method_name_len); |
|
580 |
TempNewSymbol signature = SymbolTable::probe(signature_name, signature_name_len); |
|
581 |
||
582 |
Method* m; |
|
583 |
if (name == NULL || signature == NULL) { |
|
584 |
m = NULL; |
|
585 |
} else if (name == vmSymbols::object_initializer_name() || |
|
586 |
name == vmSymbols::class_initializer_name()) { |
|
587 |
// Never search superclasses for constructors |
|
588 |
if (klass->is_instance_klass()) { |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
589 |
m = InstanceKlass::cast(klass)->find_method(name, signature); |
42650 | 590 |
} else { |
591 |
m = NULL; |
|
592 |
} |
|
593 |
} else { |
|
594 |
m = klass->lookup_method(name, signature); |
|
595 |
if (m == NULL && klass->is_instance_klass()) { |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
596 |
m = InstanceKlass::cast(klass)->lookup_method_in_ordered_interfaces(name, signature); |
42650 | 597 |
} |
598 |
} |
|
599 |
if (m == NULL) { |
|
600 |
// Fatal error because we assume classes and methods should not be changed since aot compilation. |
|
601 |
const char* klass_name = klass->external_name(); |
|
602 |
int klass_len = (int)strlen(klass_name); |
|
603 |
char* meta_name = NEW_RESOURCE_ARRAY(char, klass_len + 1 + method_name_len + signature_name_len + 1); |
|
604 |
memcpy(meta_name, klass_name, klass_len); |
|
605 |
meta_name[klass_len] = '.'; |
|
606 |
memcpy(&meta_name[klass_len + 1], method_name, method_name_len); |
|
607 |
memcpy(&meta_name[klass_len + 1 + method_name_len], signature_name, signature_name_len); |
|
608 |
meta_name[klass_len + 1 + method_name_len + signature_name_len] = '\0'; |
|
609 |
Handle exception = Exceptions::new_exception(thread, vmSymbols::java_lang_NoSuchMethodError(), meta_name); |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46260
diff
changeset
|
610 |
java_lang_Throwable::print(exception(), tty); |
42650 | 611 |
tty->cr(); |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
46260
diff
changeset
|
612 |
java_lang_Throwable::print_stack_trace(exception, tty); |
42650 | 613 |
tty->cr(); |
614 |
fatal("Failed to find method '%s'", meta_name); |
|
615 |
} |
|
616 |
NOT_PRODUCT( aot_methods_found++; ) |
|
617 |
return m; |
|
618 |
} |
|
619 |
||
47668 | 620 |
AOTKlassData* AOTCodeHeap::find_klass(const char *name) { |
621 |
return (AOTKlassData*) os::dll_lookup(_lib->dl_handle(), name); |
|
622 |
} |
|
623 |
||
42650 | 624 |
AOTKlassData* AOTCodeHeap::find_klass(InstanceKlass* ik) { |
625 |
ResourceMark rm; |
|
47668 | 626 |
AOTKlassData* klass_data = find_klass(ik->signature_name()); |
42650 | 627 |
return klass_data; |
628 |
} |
|
629 |
||
630 |
bool AOTCodeHeap::is_dependent_method(Klass* dependee, AOTCompiledMethod* aot) { |
|
631 |
InstanceKlass *dependee_ik = InstanceKlass::cast(dependee); |
|
632 |
AOTKlassData* klass_data = find_klass(dependee_ik); |
|
633 |
if (klass_data == NULL) { |
|
634 |
return false; // no AOT records for this class - no dependencies |
|
635 |
} |
|
636 |
if (!dependee_ik->has_passed_fingerprint_check()) { |
|
637 |
return false; // different class |
|
638 |
} |
|
639 |
||
640 |
int methods_offset = klass_data->_dependent_methods_offset; |
|
641 |
if (methods_offset >= 0) { |
|
642 |
address methods_cnt_adr = _dependencies + methods_offset; |
|
643 |
int methods_cnt = *(int*)methods_cnt_adr; |
|
644 |
int* indexes = (int*)(methods_cnt_adr + 4); |
|
645 |
for (int i = 0; i < methods_cnt; ++i) { |
|
646 |
int code_id = indexes[i]; |
|
647 |
if (_code_to_aot[code_id]._aot == aot) { |
|
648 |
return true; // found dependent method |
|
649 |
} |
|
650 |
} |
|
651 |
} |
|
652 |
return false; |
|
653 |
} |
|
654 |
||
47668 | 655 |
void AOTCodeHeap::sweep_dependent_methods(int* indexes, int methods_cnt) { |
656 |
int marked = 0; |
|
657 |
for (int i = 0; i < methods_cnt; ++i) { |
|
658 |
int code_id = indexes[i]; |
|
659 |
// Invalidate aot code. |
|
660 |
if (Atomic::cmpxchg(invalid, &_code_to_aot[code_id]._state, not_set) != not_set) { |
|
661 |
if (_code_to_aot[code_id]._state == in_use) { |
|
662 |
AOTCompiledMethod* aot = _code_to_aot[code_id]._aot; |
|
663 |
assert(aot != NULL, "aot should be set"); |
|
664 |
if (!aot->is_runtime_stub()) { // Something is wrong - should not invalidate stubs. |
|
665 |
aot->mark_for_deoptimization(false); |
|
666 |
marked++; |
|
667 |
} |
|
668 |
} |
|
669 |
} |
|
670 |
} |
|
671 |
if (marked > 0) { |
|
672 |
VM_Deoptimize op; |
|
673 |
VMThread::execute(&op); |
|
674 |
} |
|
675 |
} |
|
676 |
||
42650 | 677 |
void AOTCodeHeap::sweep_dependent_methods(AOTKlassData* klass_data) { |
678 |
// Make dependent methods non_entrant forever. |
|
679 |
int methods_offset = klass_data->_dependent_methods_offset; |
|
680 |
if (methods_offset >= 0) { |
|
681 |
address methods_cnt_adr = _dependencies + methods_offset; |
|
682 |
int methods_cnt = *(int*)methods_cnt_adr; |
|
683 |
int* indexes = (int*)(methods_cnt_adr + 4); |
|
47668 | 684 |
sweep_dependent_methods(indexes, methods_cnt); |
42650 | 685 |
} |
686 |
} |
|
687 |
||
47668 | 688 |
void AOTCodeHeap::sweep_dependent_methods(InstanceKlass* ik) { |
689 |
AOTKlassData* klass_data = find_klass(ik); |
|
690 |
vmassert(klass_data != NULL, "dependency data missing"); |
|
691 |
sweep_dependent_methods(klass_data); |
|
692 |
} |
|
693 |
||
694 |
void AOTCodeHeap::sweep_method(AOTCompiledMethod *aot) { |
|
695 |
int indexes[] = {aot->method_index()}; |
|
696 |
sweep_dependent_methods(indexes, 1); |
|
697 |
vmassert(aot->method()->code() != aot && aot->method()->aot_code() == NULL, "method still active"); |
|
698 |
} |
|
699 |
||
700 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
701 |
bool AOTCodeHeap::load_klass_data(InstanceKlass* ik, Thread* thread) { |
42650 | 702 |
ResourceMark rm; |
703 |
||
704 |
NOT_PRODUCT( klasses_seen++; ) |
|
705 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
706 |
AOTKlassData* klass_data = find_klass(ik); |
42650 | 707 |
if (klass_data == NULL) { |
708 |
return false; |
|
709 |
} |
|
710 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
711 |
if (!ik->has_passed_fingerprint_check()) { |
42650 | 712 |
NOT_PRODUCT( aot_klasses_fp_miss++; ) |
713 |
log_trace(aot, class, fingerprint)("class %s%s has bad fingerprint in %s tid=" INTPTR_FORMAT, |
|
46949 | 714 |
ik->internal_name(), ik->is_shared() ? " (shared)" : "", |
715 |
_lib->name(), p2i(thread)); |
|
42650 | 716 |
sweep_dependent_methods(klass_data); |
717 |
return false; |
|
718 |
} |
|
719 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
720 |
if (ik->has_been_redefined()) { |
42650 | 721 |
log_trace(aot, class, load)("class %s%s in %s has been redefined tid=" INTPTR_FORMAT, |
46949 | 722 |
ik->internal_name(), ik->is_shared() ? " (shared)" : "", |
723 |
_lib->name(), p2i(thread)); |
|
42650 | 724 |
sweep_dependent_methods(klass_data); |
725 |
return false; |
|
726 |
} |
|
727 |
||
728 |
assert(klass_data->_class_id < _class_count, "invalid class id"); |
|
729 |
AOTClass* aot_class = &_classes[klass_data->_class_id]; |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
730 |
if (aot_class->_classloader != NULL && aot_class->_classloader != ik->class_loader_data()) { |
42650 | 731 |
log_trace(aot, class, load)("class %s in %s already loaded for classloader %p vs %p tid=" INTPTR_FORMAT, |
46949 | 732 |
ik->internal_name(), _lib->name(), aot_class->_classloader, ik->class_loader_data(), p2i(thread)); |
42650 | 733 |
NOT_PRODUCT( aot_klasses_cl_miss++; ) |
734 |
return false; |
|
735 |
} |
|
736 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
737 |
if (_lib->config()->_omitAssertions && JavaAssertions::enabled(ik->name()->as_C_string(), ik->class_loader() == NULL)) { |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
738 |
log_trace(aot, class, load)("class %s in %s does not have java assertions in compiled code, but assertions are enabled for this execution.", ik->internal_name(), _lib->name()); |
43405
1fab8e6866d7
8168792: [AOT] problems in MethodHandle with aot-compiled java.base
iveresov
parents:
42650
diff
changeset
|
739 |
sweep_dependent_methods(klass_data); |
1fab8e6866d7
8168792: [AOT] problems in MethodHandle with aot-compiled java.base
iveresov
parents:
42650
diff
changeset
|
740 |
return false; |
1fab8e6866d7
8168792: [AOT] problems in MethodHandle with aot-compiled java.base
iveresov
parents:
42650
diff
changeset
|
741 |
} |
1fab8e6866d7
8168792: [AOT] problems in MethodHandle with aot-compiled java.base
iveresov
parents:
42650
diff
changeset
|
742 |
|
42650 | 743 |
NOT_PRODUCT( aot_klasses_found++; ) |
744 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
745 |
log_trace(aot, class, load)("found %s in %s for classloader %p tid=" INTPTR_FORMAT, ik->internal_name(), _lib->name(), ik->class_loader_data(), p2i(thread)); |
42650 | 746 |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
747 |
aot_class->_classloader = ik->class_loader_data(); |
42650 | 748 |
// Set klass's Resolve (second) got cell. |
46949 | 749 |
_klasses_got[klass_data->_got_index] = ik; |
47668 | 750 |
if (ik->is_initialized()) { |
751 |
_klasses_got[klass_data->_got_index - 1] = ik; |
|
752 |
} |
|
42650 | 753 |
|
43405
1fab8e6866d7
8168792: [AOT] problems in MethodHandle with aot-compiled java.base
iveresov
parents:
42650
diff
changeset
|
754 |
// Initialize global symbols of the DSO to the corresponding VM symbol values. |
42650 | 755 |
link_global_lib_symbols(); |
756 |
||
757 |
int methods_offset = klass_data->_compiled_methods_offset; |
|
758 |
if (methods_offset >= 0) { |
|
759 |
address methods_cnt_adr = _methods_offsets + methods_offset; |
|
760 |
int methods_cnt = *(int*)methods_cnt_adr; |
|
761 |
// Collect data about compiled methods |
|
762 |
AOTMethodData* methods_data = NEW_RESOURCE_ARRAY(AOTMethodData, methods_cnt); |
|
763 |
AOTMethodOffsets* methods_offsets = (AOTMethodOffsets*)(methods_cnt_adr + 4); |
|
764 |
for (int i = 0; i < methods_cnt; ++i) { |
|
765 |
AOTMethodOffsets* method_offsets = &methods_offsets[i]; |
|
766 |
int code_id = method_offsets->_code_id; |
|
767 |
if (_code_to_aot[code_id]._state == invalid) { |
|
768 |
continue; // skip AOT methods slots which have been invalidated |
|
769 |
} |
|
770 |
AOTMethodData* method_data = &methods_data[i]; |
|
771 |
const char* aot_name = _metaspace_names + method_offsets->_name_offset; |
|
772 |
method_data->_name = aot_name; |
|
773 |
method_data->_code = _code_space + method_offsets->_code_offset; |
|
774 |
method_data->_meta = (aot_metadata*)(_method_metadata + method_offsets->_meta_offset); |
|
775 |
method_data->_metadata_table = (address)_metadata_got + method_offsets->_metadata_got_offset; |
|
776 |
method_data->_metadata_size = method_offsets->_metadata_got_size; |
|
777 |
// aot_name format: "<u2_size>Ljava/lang/ThreadGroup;<u2_size>addUnstarted<u2_size>()V" |
|
778 |
int klass_len = build_u2_from((address)aot_name); |
|
779 |
const char* method_name = aot_name + 2 + klass_len; |
|
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
780 |
Method* m = AOTCodeHeap::find_method(ik, thread, method_name); |
42650 | 781 |
methodHandle mh(thread, m); |
782 |
if (mh->code() != NULL) { // Does it have already compiled code? |
|
783 |
continue; // Don't overwrite |
|
784 |
} |
|
785 |
publish_aot(mh, method_data, code_id); |
|
786 |
} |
|
787 |
} |
|
788 |
return true; |
|
789 |
} |
|
790 |
||
791 |
AOTCompiledMethod* AOTCodeHeap::next_in_use_at(int start) const { |
|
792 |
for (int index = start; index < _method_count; index++) { |
|
793 |
if (_code_to_aot[index]._state != in_use) { |
|
794 |
continue; // Skip uninitialized entries. |
|
795 |
} |
|
796 |
AOTCompiledMethod* aot = _code_to_aot[index]._aot; |
|
797 |
return aot; |
|
798 |
} |
|
799 |
return NULL; |
|
800 |
} |
|
801 |
||
802 |
void* AOTCodeHeap::first() const { |
|
803 |
return next_in_use_at(0); |
|
804 |
} |
|
805 |
||
806 |
void* AOTCodeHeap::next(void* p) const { |
|
807 |
AOTCompiledMethod *aot = (AOTCompiledMethod *)p; |
|
808 |
int next_index = aot->method_index() + 1; |
|
809 |
assert(next_index <= _method_count, ""); |
|
810 |
if (next_index == _method_count) { |
|
811 |
return NULL; |
|
812 |
} |
|
813 |
return next_in_use_at(next_index); |
|
814 |
} |
|
815 |
||
816 |
void* AOTCodeHeap::find_start(void* p) const { |
|
817 |
if (!contains(p)) { |
|
818 |
return NULL; |
|
819 |
} |
|
820 |
size_t offset = pointer_delta(p, low_boundary(), 1); |
|
821 |
// Use segments table |
|
822 |
size_t seg_idx = offset / _lib->config()->_codeSegmentSize; |
|
823 |
if ((int)(_code_segments[seg_idx]) == 0xff) { |
|
824 |
return NULL; |
|
825 |
} |
|
826 |
while (_code_segments[seg_idx] > 0) { |
|
827 |
seg_idx -= (int)_code_segments[seg_idx]; |
|
828 |
} |
|
829 |
int code_offset = (int)seg_idx * _lib->config()->_codeSegmentSize; |
|
830 |
int aot_index = *(int*)(_code_space + code_offset); |
|
831 |
AOTCompiledMethod* aot = _code_to_aot[aot_index]._aot; |
|
832 |
assert(aot != NULL, "should find registered aot method"); |
|
833 |
return aot; |
|
834 |
} |
|
835 |
||
836 |
AOTCompiledMethod* AOTCodeHeap::find_aot(address p) const { |
|
837 |
assert(contains(p), "should be here"); |
|
838 |
return (AOTCompiledMethod *)find_start(p); |
|
839 |
} |
|
840 |
||
841 |
CodeBlob* AOTCodeHeap::find_blob_unsafe(void* start) const { |
|
842 |
return (CodeBlob*)AOTCodeHeap::find_start(start); |
|
843 |
} |
|
844 |
||
845 |
void AOTCodeHeap::oops_do(OopClosure* f) { |
|
846 |
for (int i = 0; i < _oop_got_size; i++) { |
|
847 |
oop* p = &_oop_got[i]; |
|
848 |
if (*p == NULL) continue; // skip non-oops |
|
849 |
f->do_oop(p); |
|
850 |
} |
|
851 |
for (int index = 0; index < _method_count; index++) { |
|
852 |
if (_code_to_aot[index]._state != in_use) { |
|
853 |
continue; // Skip uninitialized entries. |
|
854 |
} |
|
855 |
AOTCompiledMethod* aot = _code_to_aot[index]._aot; |
|
856 |
aot->do_oops(f); |
|
857 |
} |
|
858 |
} |
|
859 |
||
46949 | 860 |
// Scan only klasses_got cells which should have only Klass*, |
43942
fff6b7b5611f
8173794: [REDO] [AOT] Missing GC scan of _metaspace_got array containing Klass*
kvn
parents:
43461
diff
changeset
|
861 |
// metadata_got cells are scanned only for alive AOT methods |
fff6b7b5611f
8173794: [REDO] [AOT] Missing GC scan of _metaspace_got array containing Klass*
kvn
parents:
43461
diff
changeset
|
862 |
// by AOTCompiledMethod::metadata_do(). |
42650 | 863 |
void AOTCodeHeap::got_metadata_do(void f(Metadata*)) { |
46949 | 864 |
for (int i = 1; i < _klasses_got_size; i++) { |
865 |
Metadata** p = &_klasses_got[i]; |
|
42650 | 866 |
Metadata* md = *p; |
867 |
if (md == NULL) continue; // skip non-oops |
|
868 |
if (Metaspace::contains(md)) { |
|
869 |
f(md); |
|
870 |
} else { |
|
43942
fff6b7b5611f
8173794: [REDO] [AOT] Missing GC scan of _metaspace_got array containing Klass*
kvn
parents:
43461
diff
changeset
|
871 |
intptr_t meta = (intptr_t)md; |
47668 | 872 |
fatal("Invalid value in _klasses_got[%d] = " INTPTR_FORMAT, i, meta); |
42650 | 873 |
} |
874 |
} |
|
875 |
} |
|
876 |
||
877 |
void AOTCodeHeap::cleanup_inline_caches() { |
|
878 |
for (int index = 0; index < _method_count; index++) { |
|
879 |
if (_code_to_aot[index]._state != in_use) { |
|
880 |
continue; // Skip uninitialized entries. |
|
881 |
} |
|
882 |
AOTCompiledMethod* aot = _code_to_aot[index]._aot; |
|
883 |
aot->cleanup_inline_caches(); |
|
884 |
} |
|
885 |
} |
|
886 |
||
887 |
#ifdef ASSERT |
|
888 |
int AOTCodeHeap::verify_icholder_relocations() { |
|
889 |
int count = 0; |
|
890 |
for (int index = 0; index < _method_count; index++) { |
|
891 |
if (_code_to_aot[index]._state != in_use) { |
|
892 |
continue; // Skip uninitialized entries. |
|
893 |
} |
|
894 |
AOTCompiledMethod* aot = _code_to_aot[index]._aot; |
|
895 |
count += aot->verify_icholder_relocations(); |
|
896 |
} |
|
897 |
return count; |
|
898 |
} |
|
899 |
#endif |
|
900 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46327
diff
changeset
|
901 |
void AOTCodeHeap::flush_evol_dependents_on(InstanceKlass* dependee) { |
42650 | 902 |
for (int index = 0; index < _method_count; index++) { |
903 |
if (_code_to_aot[index]._state != in_use) { |
|
904 |
continue; // Skip uninitialized entries. |
|
905 |
} |
|
906 |
AOTCompiledMethod* aot = _code_to_aot[index]._aot; |
|
907 |
aot->flush_evol_dependents_on(dependee); |
|
908 |
} |
|
909 |
} |
|
910 |
||
911 |
void AOTCodeHeap::metadata_do(void f(Metadata*)) { |
|
912 |
for (int index = 0; index < _method_count; index++) { |
|
913 |
if (_code_to_aot[index]._state != in_use) { |
|
914 |
continue; // Skip uninitialized entries. |
|
915 |
} |
|
916 |
AOTCompiledMethod* aot = _code_to_aot[index]._aot; |
|
917 |
if (aot->_is_alive()) { |
|
918 |
aot->metadata_do(f); |
|
919 |
} |
|
920 |
} |
|
47668 | 921 |
// Scan klasses_got cells. |
42650 | 922 |
got_metadata_do(f); |
923 |
} |
|
47668 | 924 |
|
925 |
bool AOTCodeHeap::reconcile_dynamic_klass(AOTCompiledMethod *caller, InstanceKlass* holder, int index, Klass *dyno_klass, const char *descriptor1, const char *descriptor2) { |
|
926 |
const char * const descriptors[2] = {descriptor1, descriptor2}; |
|
927 |
JavaThread *thread = JavaThread::current(); |
|
928 |
ResourceMark rm(thread); |
|
929 |
||
930 |
AOTKlassData* holder_data = find_klass(holder); |
|
931 |
vmassert(holder_data != NULL, "klass %s not found", holder->signature_name()); |
|
932 |
vmassert(is_dependent_method(holder, caller), "sanity"); |
|
933 |
||
934 |
AOTKlassData* dyno_data = NULL; |
|
935 |
bool adapter_failed = false; |
|
936 |
char buf[64]; |
|
937 |
int descriptor_index = 0; |
|
938 |
// descriptors[0] specific name ("adapter:<method_id>") for matching |
|
939 |
// descriptors[1] fall-back name ("adapter") for depdencies |
|
940 |
while (descriptor_index < 2) { |
|
941 |
const char *descriptor = descriptors[descriptor_index]; |
|
942 |
if (descriptor == NULL) { |
|
943 |
break; |
|
944 |
} |
|
945 |
jio_snprintf(buf, sizeof buf, "%s<%d:%d>", descriptor, holder_data->_class_id, index); |
|
946 |
dyno_data = find_klass(buf); |
|
947 |
if (dyno_data != NULL) { |
|
948 |
break; |
|
949 |
} |
|
950 |
// If match failed then try fall-back for dependencies |
|
951 |
++descriptor_index; |
|
952 |
adapter_failed = true; |
|
953 |
} |
|
954 |
||
955 |
if (dyno_data == NULL && dyno_klass == NULL) { |
|
956 |
// all is well, no (appendix) at compile-time, and still none |
|
957 |
return true; |
|
958 |
} |
|
959 |
||
960 |
if (dyno_data == NULL) { |
|
961 |
// no (appendix) at build-time, but now there is |
|
962 |
sweep_dependent_methods(holder_data); |
|
963 |
return false; |
|
964 |
} |
|
965 |
||
966 |
if (adapter_failed) { |
|
967 |
// adapter method mismatch |
|
968 |
sweep_dependent_methods(holder_data); |
|
969 |
sweep_dependent_methods(dyno_data); |
|
970 |
return false; |
|
971 |
} |
|
972 |
||
973 |
if (dyno_klass == NULL) { |
|
974 |
// (appendix) at build-time, none now |
|
975 |
sweep_dependent_methods(holder_data); |
|
976 |
sweep_dependent_methods(dyno_data); |
|
977 |
return false; |
|
978 |
} |
|
979 |
||
980 |
// TODO: support array appendix object |
|
981 |
if (!dyno_klass->is_instance_klass()) { |
|
982 |
sweep_dependent_methods(holder_data); |
|
983 |
sweep_dependent_methods(dyno_data); |
|
984 |
return false; |
|
985 |
} |
|
986 |
||
987 |
InstanceKlass* dyno = InstanceKlass::cast(dyno_klass); |
|
988 |
||
989 |
if (!dyno->is_anonymous()) { |
|
990 |
if (_klasses_got[dyno_data->_got_index] != dyno) { |
|
991 |
// compile-time class different from runtime class, fail and deoptimize |
|
992 |
sweep_dependent_methods(holder_data); |
|
993 |
sweep_dependent_methods(dyno_data); |
|
994 |
return false; |
|
995 |
} |
|
996 |
||
997 |
if (dyno->is_initialized()) { |
|
998 |
_klasses_got[dyno_data->_got_index - 1] = dyno; |
|
999 |
} |
|
1000 |
return true; |
|
1001 |
} |
|
1002 |
||
1003 |
// TODO: support anonymous supers |
|
1004 |
if (!dyno->supers_have_passed_fingerprint_checks() || dyno->get_stored_fingerprint() != dyno_data->_fingerprint) { |
|
1005 |
NOT_PRODUCT( aot_klasses_fp_miss++; ) |
|
1006 |
log_trace(aot, class, fingerprint)("class %s%s has bad fingerprint in %s tid=" INTPTR_FORMAT, |
|
1007 |
dyno->internal_name(), dyno->is_shared() ? " (shared)" : "", |
|
1008 |
_lib->name(), p2i(thread)); |
|
1009 |
sweep_dependent_methods(holder_data); |
|
1010 |
sweep_dependent_methods(dyno_data); |
|
1011 |
return false; |
|
1012 |
} |
|
1013 |
||
1014 |
_klasses_got[dyno_data->_got_index] = dyno; |
|
1015 |
if (dyno->is_initialized()) { |
|
1016 |
_klasses_got[dyno_data->_got_index - 1] = dyno; |
|
1017 |
} |
|
1018 |
||
1019 |
// TODO: hook up any AOT code |
|
1020 |
// load_klass_data(dyno_data, thread); |
|
1021 |
return true; |
|
1022 |
} |
|
1023 |
||
1024 |
bool AOTCodeHeap::reconcile_dynamic_method(AOTCompiledMethod *caller, InstanceKlass* holder, int index, Method *adapter_method) { |
|
1025 |
InstanceKlass *adapter_klass = adapter_method->method_holder(); |
|
1026 |
char buf[64]; |
|
1027 |
jio_snprintf(buf, sizeof buf, "adapter:%d", adapter_method->method_idnum()); |
|
1028 |
if (!reconcile_dynamic_klass(caller, holder, index, adapter_klass, buf, "adapter")) { |
|
1029 |
return false; |
|
1030 |
} |
|
1031 |
return true; |
|
1032 |
} |
|
1033 |
||
1034 |
bool AOTCodeHeap::reconcile_dynamic_invoke(AOTCompiledMethod* caller, InstanceKlass* holder, int index, Method* adapter_method, Klass *appendix_klass) { |
|
1035 |
if (!reconcile_dynamic_klass(caller, holder, index, appendix_klass, "appendix")) { |
|
1036 |
return false; |
|
1037 |
} |
|
1038 |
||
1039 |
if (!reconcile_dynamic_method(caller, holder, index, adapter_method)) { |
|
1040 |
return false; |
|
1041 |
} |
|
1042 |
||
1043 |
return true; |
|
1044 |
} |