jdk8-mips64-public/hotspot: comparison src/share/vm/prims/jvm.cpp

-:425504a45630
+:08326a76b148
 /*
-* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 #endif
 #include "classfile/vmSymbols.hpp"
 #include "gc_interface/collectedHeap.inline.hpp"
 #include "interpreter/bytecode.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/referenceType.hpp"
 #include "memory/universe.inline.hpp"
 #include "oops/fieldStreams.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/method.hpp"
 #endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "jvm_bsd.h"
 #endif
+#if INCLUDE_ALL_GCS
+#include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
+#endif // INCLUDE_ALL_GCS
 #include <errno.h>
 #ifndef USDT2
 HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__begin, long long);
 HS_DTRACE_PROBE_DECL1(hotspot, thread__sleep__end, int);
 Handle obj(THREAD, JNIHandles::resolve_non_null(handle));
 ObjectSynchronizer::notifyall(obj, CHECK);
 JVM_END
+static void fixup_cloned_reference(ReferenceType ref_type, oop src, oop clone) {
+// If G1 is enabled then we need to register a non-null referent
+// with the SATB barrier.
+#if INCLUDE_ALL_GCS
+if (UseG1GC) {
+oop referent = java_lang_ref_Reference::referent(clone);
+if (referent != NULL) {
+G1SATBCardTableModRefBS::enqueue(referent);
+}
+}
+#endif // INCLUDE_ALL_GCS
+if ((java_lang_ref_Reference::next(clone) != NULL) ||
+(java_lang_ref_Reference::queue(clone) == java_lang_ref_ReferenceQueue::ENQUEUED_queue())) {
+// If the source has been enqueued or is being enqueued, don't
+// register the clone with a queue.
+java_lang_ref_Reference::set_queue(clone, java_lang_ref_ReferenceQueue::NULL_queue());
+}
+// discovered and next are list links; the clone is not in those lists.
+java_lang_ref_Reference::set_discovered(clone, NULL);
+java_lang_ref_Reference::set_next(clone, NULL);
+}
 JVM_ENTRY(jobject, JVM_Clone(JNIEnv* env, jobject handle))
 JVMWrapper("JVM_Clone");
 Handle obj(THREAD, JNIHandles::resolve_non_null(handle));
 const KlassHandle klass (THREAD, obj->klass());
 JvmtiVMObjectAllocEventCollector oam;
 ResourceMark rm(THREAD);
 THROW_MSG_0(vmSymbols::java_lang_CloneNotSupportedException(), klass->external_name());
 }
 // Make shallow object copy
+ReferenceType ref_type = REF_NONE;
 const int size = obj->size();
 oop new_obj_oop = NULL;
 if (obj->is_array()) {
 const int length = ((arrayOop)obj())->length();
 new_obj_oop = CollectedHeap::array_allocate(klass, size, length, CHECK_NULL);
 } else {
+ref_type = InstanceKlass::cast(klass())->reference_type();
+assert((ref_type == REF_NONE) ==
+!klass->is_subclass_of(SystemDictionary::Reference_klass()),
+"invariant");
 new_obj_oop = CollectedHeap::obj_allocate(klass, size, CHECK_NULL);
 }
 // 4839641 (4840070): We must do an oop-atomic copy, because if another thread
 // is modifying a reference field in the clonee, a non-oop-atomic copy might
 // Store check (mark entire object and let gc sort it out)
 BarrierSet* bs = Universe::heap()->barrier_set();
 assert(bs->has_write_region_opt(), "Barrier set does not have write_region");
 bs->write_region(MemRegion((HeapWord*)new_obj_oop, size));
+// If cloning a Reference, set Reference fields to a safe state.
+// Fixup must be completed before any safepoint.
+if (ref_type != REF_NONE) {
+fixup_cloned_reference(ref_type, obj(), new_obj_oop);
+}
 Handle new_obj(THREAD, new_obj_oop);
 // Special handling for MemberNames.  Since they contain Method* metadata, they
 // must be registered so that RedefineClasses can fix metadata contained in them.
 if (java_lang_invoke_MemberName::is_instance(new_obj()) &&

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/prims/jvm.cpp

src/share/vm/prims/jvm.cpp