graal-jvmci-8: src/share/vm/classfile/javaClasses.cpp comparison

comparison src/share/vm/classfile/javaClasses.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	8f2fb6bec986 fe34c5ab0b35
children	be896a1983c0

comparison

equal deleted inserted replaced

-:84105dcdb05b
+:7848fc12602b
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/klass.hpp"
 #include "oops/method.hpp"
 #include "oops/symbol.hpp"
 #include "oops/typeArrayOop.hpp"
+#include "prims/jvmtiRedefineClassesTrace.hpp"
 #include "runtime/fieldDescriptor.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 }
 }
 return true;
 }
-void java_lang_String::print(Handle java_string, outputStream* st) {
+void java_lang_String::print(oop java_string, outputStream* st) {
-oop          obj    = java_string();
+assert(java_string->klass() == SystemDictionary::String_klass(), "must be java_string");
-assert(obj->klass() == SystemDictionary::String_klass(), "must be java_string");
+typeArrayOop value  = java_lang_String::value(java_string);
-typeArrayOop value  = java_lang_String::value(obj);
+int          offset = java_lang_String::offset(java_string);
-int          offset = java_lang_String::offset(obj);
+int          length = java_lang_String::length(java_string);
-int          length = java_lang_String::length(obj);
 int end = MIN2(length, 100);
 if (value == NULL) {
 // This can happen if, e.g., printing a String
 // object before its initializer has been called
 fs.set_offset(real_offset);
 }
 }
 }
 }
-create_mirror(k, Handle(NULL), CHECK);
+create_mirror(k, Handle(NULL), Handle(NULL), CHECK);
 }
 void java_lang_Class::initialize_mirror_fields(KlassHandle k,
 Handle mirror,
 Handle protection_domain,
 // Initialize static fields
 InstanceKlass::cast(k())->do_local_static_fields(&initialize_static_field, mirror, CHECK);
 }
-void java_lang_Class::create_mirror(KlassHandle k, Handle protection_domain, TRAPS) {
+void java_lang_Class::create_mirror(KlassHandle k, Handle class_loader,
+Handle protection_domain, TRAPS) {
 assert(k->java_mirror() == NULL, "should only assign mirror once");
 // Use this moment of initialization to cache modifier_flags also,
 // to support Class.getModifiers().  Instance classes recalculate
 // the cached flags after the class file is parsed, but before the
 // class is put into the system dictionary.
 java_lang_Class::set_klass(mirror(), NULL);
 return;
 }
 }
+// set the classLoader field in the java_lang_Class instance
+assert(class_loader() == k->class_loader(), "should be same");
+set_class_loader(mirror(), class_loader());
 // Setup indirection from klass->mirror last
 // after any exceptions can happen during allocations.
 if (!k.is_null()) {
 k->set_java_mirror(mirror());
 }
 void java_lang_Class::set_signers(oop java_class, objArrayOop signers) {
 assert(_signers_offset != 0, "must be set");
 java_class->obj_field_put(_signers_offset, (oop)signers);
 }
+void java_lang_Class::set_class_loader(oop java_class, oop loader) {
+// jdk7 runs Queens in bootstrapping and jdk8-9 has no coordinated pushes yet.
+if (_class_loader_offset != 0) {
+java_class->obj_field_put(_class_loader_offset, loader);
+}
+}
+oop java_lang_Class::class_loader(oop java_class) {
+assert(_class_loader_offset != 0, "must be set");
+return java_class->obj_field(_class_loader_offset);
+}
 oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
 // This should be improved by adding a field at the Java level or by
 // introducing a new VM klass (see comment in ClassFileParser)
 oop java_class = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(NULL, CHECK_0);
 Klass* klass_oop = SystemDictionary::Class_klass();
 // The classRedefinedCount field is only present starting in 1.5,
 // so don't go fatal.
 compute_optional_offset(classRedefinedCount_offset,
 klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature());
+// Needs to be optional because the old build runs Queens during bootstrapping
+// and jdk8-9 doesn't have coordinated pushes yet.
+compute_optional_offset(_class_loader_offset,
+klass_oop, vmSymbols::classLoader_name(),
+vmSymbols::classloader_signature());
 CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
 }
 int java_lang_Class::classRedefinedCount(oop the_class_mirror) {
 Metadata* java_lang_invoke_MemberName::vmtarget(oop mname) {
 assert(is_instance(mname), "wrong type");
 return (Metadata*)mname->address_field(_vmtarget_offset);
 }
+bool java_lang_invoke_MemberName::is_method(oop mname) {
+assert(is_instance(mname), "must be MemberName");
+return (flags(mname) & (MN_IS_METHOD | MN_IS_CONSTRUCTOR)) > 0;
+}
 #if INCLUDE_JVMTI
 // Can be executed on VM thread only
-void java_lang_invoke_MemberName::adjust_vmtarget(oop mname, Metadata* ref) {
+void java_lang_invoke_MemberName::adjust_vmtarget(oop mname, Method* old_method,
-assert((is_instance(mname) && (flags(mname) & (MN_IS_METHOD | MN_IS_CONSTRUCTOR)) > 0), "wrong type");
+Method* new_method, bool* trace_name_printed) {
+assert(is_method(mname), "wrong type");
 assert(Thread::current()->is_VM_thread(), "not VM thread");
-mname->address_field_put(_vmtarget_offset, (address)ref);
+Method* target = (Method*)mname->address_field(_vmtarget_offset);
+if (target == old_method) {
+mname->address_field_put(_vmtarget_offset, (address)new_method);
+if (RC_TRACE_IN_RANGE(0x00100000, 0x00400000)) {
+if (!(*trace_name_printed)) {
+// RC_TRACE_MESG macro has an embedded ResourceMark
+RC_TRACE_MESG(("adjust: name=%s",
+old_method->method_holder()->external_name()));
+*trace_name_printed = true;
+}
+// RC_TRACE macro has an embedded ResourceMark
+RC_TRACE(0x00400000, ("MemberName method update: %s(%s)",
+new_method->name()->as_C_string(),
+new_method->signature()->as_C_string()));
+}
+}
 }
 #endif // INCLUDE_JVMTI
 void java_lang_invoke_MemberName::set_vmtarget(oop mname, Metadata* ref) {
 assert(is_instance(mname), "wrong type");
 int java_lang_Class::_klass_offset;
 int java_lang_Class::_array_klass_offset;
 int java_lang_Class::_oop_size_offset;
 int java_lang_Class::_static_oop_field_count_offset;
+int java_lang_Class::_class_loader_offset;
 int java_lang_Class::_protection_domain_offset;
 int java_lang_Class::_init_lock_offset;
 int java_lang_Class::_signers_offset;
 GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL;
 int java_lang_Throwable::backtrace_offset;

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/classfile/javaClasses.cpp @ 20804:7848fc12602b