mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clear dcevm code separation

Browse Source
This commit is contained in:
Vladimir Dvorak
2020-10-23 10:20:26 +02:00
committed by Vitaly Provodin
parent 25e7585af8
commit 1991550ffb
9 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/classfile/systemDictionary.cpp
View File

@@ -830,9 +830,8 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
EventClassLoad class_load_start_event;
ClassLoaderData* loader_data;
bool is_redefining = (old_klass != NULL);
// - for hidden classes that are not strong: create a new CLD that has a class holder and
// whose loader is the Lookup class's loader.

8
src/hotspot/share/gc/serial/genMarkSweep.cpp
View File

@@ -316,7 +316,9 @@ void GenMarkSweep::mark_sweep_phase4() {
GenCompactClosure blk;
gch->generation_iterate(&blk, true);
DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
MarkSweep::_rescued_oops = NULL;
if (AllowEnhancedClassRedefinition) {
DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
MarkSweep::_rescued_oops = NULL;
}
}

14
src/hotspot/share/interpreter/linkResolver.cpp
View File

@@ -287,9 +287,14 @@ void LinkResolver::check_klass_accessibility(Klass* ref_klass, Klass* sel_klass,
if (!base_klass->is_instance_klass()) {
return; // no relevant check to do
}
Klass* refKlassNewest = ref_klass;
Klass* baseKlassNewest = base_klass;
if (AllowEnhancedClassRedefinition) {
refKlassNewest = ref_klass->newest_version();
baseKlassNewest = base_klass->newest_version();
}
Reflection::VerifyClassAccessResults vca_result =
Reflection::verify_class_access(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
Reflection::verify_class_access(refKlassNewest, InstanceKlass::cast(baseKlassNewest), true);
if (vca_result != Reflection::ACCESS_OK) {
ResourceMark rm(THREAD);
char* msg = Reflection::verify_class_access_msg(ref_klass,
@@ -551,7 +556,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
// We'll check for the method name first, as that's most likely
// to be false (so we'll short-circuit out of these tests).
if (sel_method->name() == vmSymbols::clone_name() &&
sel_klass->newest_version() == vmClasses::Object_klass()->newest_version() &&
( !AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass() ||
AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) &&
resolved_klass->is_array_klass()) {
// We need to change "protected" to "public".
assert(flags.is_protected(), "clone not protected?");
@@ -997,7 +1003,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
// or by the <init> method (in case of an instance field).
if (is_put && fd.access_flags().is_final()) {
if (sel_klass != current_klass && sel_klass != current_klass->active_version()) {
if (sel_klass != current_klass && (!AllowEnhancedClassRedefinition || sel_klass != current_klass->active_version())) {
ResourceMark rm(THREAD);
stringStream ss;
ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class",

2
src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
View File

@@ -1475,7 +1475,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
cld,
&cl_info,
ClassFileParser::INTERNAL, // internal visibility
false,
false,
THREAD);
if (HAS_PENDING_EXCEPTION) {
log_pending_exception(PENDING_EXCEPTION);

8
src/hotspot/share/oops/cpCache.hpp
View File

@@ -148,13 +148,13 @@ class ConstantPoolCacheEntry {
void set_bytecode_2(Bytecodes::Code code);
void set_f1(Metadata* f1) {
Metadata* existing_f1 = _f1; // read once
//assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
assert(AllowEnhancedClassRedefinition || existing_f1 == NULL || existing_f1 == f1, "illegal field change");
_f1 = f1;
}
void release_set_f1(Metadata* f1);
void set_f2(intx f2) {
intx existing_f2 = _f2; // read once
//assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");
assert(AllowEnhancedClassRedefinition || existing_f2 == 0 || existing_f2 == f2, "illegal field change");
_f2 = f2;
}
void set_f2_as_vfinal_method(Method* f2) {
@@ -215,7 +215,9 @@ class ConstantPoolCacheEntry {
void initialize_resolved_reference_index(int ref_index) {
assert(_f2 == 0, "set once"); // note: ref_index might be zero also
_f2 = ref_index;
_flags = 1 << is_resolved_ref_shift;
if (AllowEnhancedClassRedefinition) {
_flags = 1 << is_resolved_ref_shift;
}
}
void set_field( // sets entry to resolved field state

6
src/hotspot/share/oops/instanceKlass.cpp
View File

@@ -968,7 +968,7 @@ bool InstanceKlass::link_class_impl(TRAPS) {
set_init_state(linked);
}
// (DCEVM) Must check for old version in order to prevent infinite loops.
if (JvmtiExport::should_post_class_prepare() && old_version() == NULL /* JVMTI deadlock otherwise */) {
if (JvmtiExport::should_post_class_prepare() && (!AllowEnhancedClassRedefinition || old_version() == NULL /* JVMTI deadlock otherwise */) {
JvmtiExport::post_class_prepare(THREAD, this);
}
}
@@ -1046,7 +1046,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
// we might end up throwing IE from link/symbol resolution sites
// that aren't expected to throw. This would wreak havoc. See 6320309.
while ((is_being_initialized() && !is_reentrant_initialization(jt))
|| (old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
|| (AllowEnhancedClassRedefinition && old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
wait = true;
jt->set_class_to_be_initialized(this);
ol.wait_uninterruptibly(jt);
@@ -3808,7 +3808,7 @@ void InstanceKlass::verify_on(outputStream* st) {
guarantee(sib->is_klass(), "should be klass");
// TODO: (DCEVM) explain
guarantee(sib->super() == super || super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
guarantee(sib->super() == super || AllowEnhancedClassRedefinition && super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
}
// Verify local interfaces

2
src/hotspot/share/oops/method.cpp
View File

@@ -2199,7 +2199,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
// Add a method id to the jmethod_ids
jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
// FIXME: (DCEVM) ???
if (m != m->newest_version()) {
if (AllowEnhancedClassRedefinition && m != m->newest_version()) {
m = m->newest_version();
}
ClassLoaderData* cld = loader_data;

2
src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
View File

@@ -76,7 +76,7 @@ public:
// the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
// changed in java8 where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
// must use new versions only.
if (k->new_version()==NULL) {
if (AllowEnhancedClassRedefinition && k->new_version()==NULL) {
_classStack.push((jclass) _env->jni_reference(Handle(_cur_thread, k->java_mirror())));
if (_dictionary_walk) {
// Collect array classes this way when walking the dictionary (because array classes are

2
src/hotspot/share/runtime/reflection.cpp
View File

@@ -608,7 +608,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
TRAPS) {
// (DCEVM) Decide accessibility based on active version
if (current_class != NULL) {
if (AllowEnhancedClassRedefinition && current_class != NULL) {
current_class = current_class->active_version();
}