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

comparison src/share/vm/prims/jvm.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25

author	Gilles Duboscq <gilles.m.duboscq@oracle.com>
date	Tue, 07 Apr 2015 14:58:49 +0200
parents	2a69cbe850a8 d4caf9c96afd
children	be896a1983c0

comparison

equal deleted inserted replaced

-:84105dcdb05b
+:7848fc12602b
 *
 */
 #include "precompiled.hpp"
 #include "classfile/classLoader.hpp"
+#include "classfile/classLoaderExt.hpp"
 #include "classfile/javaAssertions.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
+#if INCLUDE_CDS
+#include "classfile/sharedClassUtil.hpp"
+#include "classfile/systemDictionaryShared.hpp"
+#endif
 #include "classfile/vmSymbols.hpp"
 #include "gc_interface/collectedHeap.inline.hpp"
 #include "interpreter/bytecode.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.inline.hpp"
 #include "runtime/init.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/jfieldIDWorkaround.hpp"
+#include "runtime/orderAccess.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfData.hpp"
 #include "runtime/reflection.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vm_operations.hpp"
 (Arguments::mode() != Arguments::_int)) {
 PUTPROP(props, "sun.management.compiler", compiler_name);
 }
 }
+const char* enableSharedLookupCache = "false";
+#if INCLUDE_CDS
+if (ClassLoaderExt::is_lookup_cache_enabled()) {
+enableSharedLookupCache = "true";
+}
+#endif
+PUTPROP(props, "sun.cds.enableSharedLookupCache", enableSharedLookupCache);
 return properties;
 JVM_END
 /*
 THROW_MSG_0(vmSymbols::java_lang_CloneNotSupportedException(), klass->external_name());
 }
 // Make shallow object copy
 const int size = obj->size();
-oop new_obj = NULL;
+oop new_obj_oop = NULL;
 if (obj->is_array()) {
 const int length = ((arrayOop)obj())->length();
-new_obj = CollectedHeap::array_allocate(klass, size, length, CHECK_NULL);
+new_obj_oop = CollectedHeap::array_allocate(klass, size, length, CHECK_NULL);
 } else {
-new_obj = CollectedHeap::obj_allocate(klass, size, CHECK_NULL);
+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
 // be suspended in the middle of copying the pointer and end up with parts
 // of two different pointers in the field.  Subsequent dereferences will crash.
 // 4846409: an oop-copy of objects with long or double fields or arrays of same
 // won't copy the longs/doubles atomically in 32-bit vm's, so we copy jlongs instead
 // of oops.  We know objects are aligned on a minimum of an jlong boundary.
 // The same is true of StubRoutines::object_copy and the various oop_copy
 // variants, and of the code generated by the inline_native_clone intrinsic.
 assert(MinObjAlignmentInBytes >= BytesPerLong, "objects misaligned");
-Copy::conjoint_jlongs_atomic((jlong*)obj(), (jlong*)new_obj,
+Copy::conjoint_jlongs_atomic((jlong*)obj(), (jlong*)new_obj_oop,
 (size_t)align_object_size(size) / HeapWordsPerLong);
 // Clear the header
-new_obj->init_mark();
+new_obj_oop->init_mark();
 // 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, size));
+bs->write_region(MemRegion((HeapWord*)new_obj_oop, size));
+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()) &&
+java_lang_invoke_MemberName::is_method(new_obj())) {
+Method* method = (Method*)java_lang_invoke_MemberName::vmtarget(new_obj());
+// MemberName may be unresolved, so doesn't need registration until resolved.
+if (method != NULL) {
+methodHandle m(THREAD, method);
+// This can safepoint and redefine method, so need both new_obj and method
+// in a handle, for two different reasons.  new_obj can move, method can be
+// deleted if nothing is using it on the stack.
+m->method_holder()->add_member_name(new_obj());
+}
+}
 // Caution: this involves a java upcall, so the clone should be
 // "gc-robust" by this stage.
 if (klass->has_finalizer()) {
 assert(obj->is_instance(), "should be instanceOop");
-new_obj = InstanceKlass::register_finalizer(instanceOop(new_obj), CHECK_NULL);
+new_obj_oop = InstanceKlass::register_finalizer(instanceOop(new_obj()), CHECK_NULL);
-}
+new_obj = Handle(THREAD, new_obj_oop);
+}
-return JNIHandles::make_local(env, oop(new_obj));
+return JNIHandles::make_local(env, new_obj());
 JVM_END
 // java.lang.Compiler ////////////////////////////////////////////////////
 // The initial cuts of the HotSpot VM will not support JITs, and all existing
 JVMWrapper("JVM_ResolveClass");
 if (PrintJVMWarnings) warning("JVM_ResolveClass not implemented");
 JVM_END
+JVM_ENTRY(jboolean, JVM_KnownToNotExist(JNIEnv *env, jobject loader, const char *classname))
+JVMWrapper("JVM_KnownToNotExist");
+#if INCLUDE_CDS
+return ClassLoaderExt::known_to_not_exist(env, loader, classname, CHECK_(false));
+#else
+return false;
+#endif
+JVM_END
+JVM_ENTRY(jobjectArray, JVM_GetResourceLookupCacheURLs(JNIEnv *env, jobject loader))
+JVMWrapper("JVM_GetResourceLookupCacheURLs");
+#if INCLUDE_CDS
+return ClassLoaderExt::get_lookup_cache_urls(env, loader, CHECK_NULL);
+#else
+return NULL;
+#endif
+JVM_END
+JVM_ENTRY(jintArray, JVM_GetResourceLookupCache(JNIEnv *env, jobject loader, const char *resource_name))
+JVMWrapper("JVM_GetResourceLookupCache");
+#if INCLUDE_CDS
+return ClassLoaderExt::get_lookup_cache(env, loader, resource_name, CHECK_NULL);
+#else
+return NULL;
+#endif
+JVM_END
 // Returns a class loaded by the bootstrap class loader; or null
 // if not found.  ClassNotFoundException is not thrown.
 //
 // Rationale behind JVM_FindClassFromBootLoader
 // a> JVM_FindClassFromClassLoader was never exported in the export tables.
 Klass* k = SystemDictionary::find_instance_or_array_klass(klass_name,
 h_loader,
 Handle(),
 CHECK_NULL);
+#if INCLUDE_CDS
+if (k == NULL) {
+// If the class is not already loaded, try to see if it's in the shared
+// archive for the current classloader (h_loader).
+instanceKlassHandle ik = SystemDictionaryShared::find_or_load_shared_class(
+klass_name, h_loader, CHECK_NULL);
+k = ik();
+}
+#endif
 return (k == NULL) ? NULL :
 (jclass) JNIHandles::make_local(env, k->java_mirror());
 JVM_END
 }
 JVM_END
 JVM_ENTRY(void, JVM_GetVersionInfo(JNIEnv* env, jvm_version_info* info, size_t info_size))
 {
-memset(info, 0, sizeof(info_size));
+memset(info, 0, info_size);
 info->jvm_version = Abstract_VM_Version::jvm_version();
 info->update_version = 0;          /* 0 in HotSpot Express VM */
 info->special_update_version = 0;  /* 0 in HotSpot Express VM */

Mercurial > hg > truffle

comparison src/share/vm/prims/jvm.cpp @ 20804:7848fc12602b