blob: 381a000135fbb7d556b22a08ed75fd9e4c7538f8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
# HG changeset patch
# Parent 89c7125da633a3b47b117c4c7ccbc60b6daa7581
diff -r 89c7125da633 src/share/vm/oops/cpCache.cpp
--- a/src/share/vm/oops/cpCache.cpp Wed Apr 06 12:04:17 2016 -0700
+++ b/src/share/vm/oops/cpCache.cpp Wed Apr 06 13:37:24 2016 -0700
@@ -536,8 +536,9 @@
// Enhanced RedefineClasses() API support (DCEVM):
// Clear cached entry, let it be re-resolved
void ConstantPoolCacheEntry::clear_entry() {
+ // Always clear for invokehandle/invokedynamic to re-resolve them
+ bool clearF1 = bytecode_1() == Bytecodes::_invokehandle || bytecode_1() == Bytecodes::_invokedynamic;
_indices = constant_pool_index();
- _f1 = NULL;
if (!is_resolved_reference()) {
_f2 = 0;
}
@@ -547,6 +548,9 @@
// For example, it's used in TemplateInterpreterGenerator::generate_return_entry_for
// Also, we need to keep flag marking entry as one containing resolved_reference
_flags &= parameter_size_mask | (1 << is_resolved_ref_shift);
+ if (clearF1) {
+ _f1 = NULL;
+ }
}
#endif // INCLUDE_JVMTI
diff -r 89c7125da633 src/share/vm/oops/cpCache.hpp
--- a/src/share/vm/oops/cpCache.hpp Wed Apr 06 12:04:17 2016 -0700
+++ b/src/share/vm/oops/cpCache.hpp Wed Apr 06 13:37:24 2016 -0700
@@ -141,7 +141,7 @@
void set_bytecode_2(Bytecodes::Code code);
void set_f1(Metadata* f1) {
Metadata* existing_f1 = (Metadata*)_f1; // read once
- assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
+ //assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
_f1 = f1;
}
void release_set_f1(Metadata* f1);
|
