archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6667089: 3/3 multiple redefinitions of a class break reflection

Browse source 
Use instanceKlass::method_with_idnum() instead of slot() to work with RedefineClasses().

Reviewed-by: sspitsyn
This commit is contained in:
Daniel D. Daugherty 2008-03-12 18:39:05 -07:00
parent 2927815658
commit 63a8cc420e
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/vm/runtime/reflection.cpp
View file

@ -1548,10 +1548,11 @@ oop Reflection::invoke_method(oop method_mirror, Handle receiver, objArrayHandle
} }
instanceKlassHandle klass(THREAD, java_lang_Class::as_klassOop(mirror)); instanceKlassHandle klass(THREAD, java_lang_Class::as_klassOop(mirror));
if (!klass->methods()->is_within_bounds(slot)) { methodOop m = klass->method_with_idnum(slot);
if (m == NULL) {
THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke"); THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke");
} }
methodHandle method(THREAD, methodOop(klass->methods()->obj_at(slot))); methodHandle method(THREAD, m);
return invoke(klass, method, receiver, override, ptypes, rtype, args, true, THREAD); return invoke(klass, method, receiver, override, ptypes, rtype, args, true, THREAD);
} }
@ -1564,10 +1565,11 @@ oop Reflection::invoke_constructor(oop constructor_mirror, objArrayHandle args,
objArrayHandle ptypes(THREAD, objArrayOop(java_lang_reflect_Constructor::parameter_types(constructor_mirror))); objArrayHandle ptypes(THREAD, objArrayOop(java_lang_reflect_Constructor::parameter_types(constructor_mirror)));
instanceKlassHandle klass(THREAD, java_lang_Class::as_klassOop(mirror)); instanceKlassHandle klass(THREAD, java_lang_Class::as_klassOop(mirror));
if (!klass->methods()->is_within_bounds(slot)) { methodOop m = klass->method_with_idnum(slot);
if (m == NULL) {
THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke"); THROW_MSG_0(vmSymbols::java_lang_InternalError(), "invoke");
} }
methodHandle method(THREAD, methodOop(klass->methods()->obj_at(slot))); methodHandle method(THREAD, m);
assert(method->name() == vmSymbols::object_initializer_name(), "invalid constructor"); assert(method->name() == vmSymbols::object_initializer_name(), "invalid constructor");
// Make sure klass gets initialize // Make sure klass gets initialize