FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR java/19285 (Interfaces not initialized by static field access)

Browse source 
2005-04-27  Andrew Haley  <aph@redhat.com>

        PR java/19285
        * prims.cc (_Jv_ResolvePoolEntry): New function.
        * include/jvm.h (_Jv_Linker::find_field): New arg: found_class.
        * link.cc (_Jv_Linker::find_field): New arg: found_class.
        (resolve_pool_entry): Initialize the class in which a field is
        found.
        (link_symbol_table): Pass new arg to found_class.

From-SVN: r99006
This commit is contained in:
Andrew Haley 2005-04-29 18:35:36 +00:00 • committed by Andrew Haley
parent 528a7d2262
commit f3dc41fe8e
4 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libjava/ChangeLog
View file

@ -1,3 +1,13 @@
2005-04-27 Andrew Haley <aph@redhat.com>
PR java/19285
* prims.cc (_Jv_ResolvePoolEntry): New function.
* include/jvm.h (_Jv_Linker::find_field): New arg: found_class.
* link.cc (_Jv_Linker::find_field): New arg: found_class.
(resolve_pool_entry): Initialize the class in which a field is
found.
(link_symbol_table): Pass new arg to found_class.
2005-04-29 Michael Koch <konqueror@gmx.de>
* java/nio/charset/Charset.java

2
libjava/include/jvm.h
View file

@ -238,7 +238,7 @@ class _Jv_Linker
private:
static _Jv_Field *find_field_helper(jclass, _Jv_Utf8Const *, _Jv_Utf8Const *,
jclass *);
static _Jv_Field *find_field(jclass, jclass, _Jv_Utf8Const *,
static _Jv_Field *find_field(jclass, jclass, jclass *, _Jv_Utf8Const *,
_Jv_Utf8Const *);
static void prepare_constant_time_tables(jclass);
static jshort get_interfaces(jclass, _Jv_ifaces *);

24
libjava/link.cc
View file

@ -165,11 +165,14 @@ _Jv_Linker::has_field_p (jclass search, _Jv_Utf8Const *field_name)
// KLASS is the class that is requesting the field.
// OWNER is the class in which the field should be found.
// FIELD_TYPE_NAME is the type descriptor for the field.
// Fill FOUND_CLASS with the address of the class in which the field
// is actually declared.
// This function does the class loader type checks, and
// also access checks. Returns the field, or throws an
// exception on error.
_Jv_Field *
_Jv_Linker::find_field (jclass klass, jclass owner,
jclass *found_class,
_Jv_Utf8Const *field_name,
_Jv_Utf8Const *field_type_name)
{
@ -180,9 +183,8 @@ _Jv_Linker::find_field (jclass klass, jclass owner,
if (field_type == NULL)
throw new java::lang::NoClassDefFoundError(field_name->toString());
jclass found_class = 0;
_Jv_Field *the_field = find_field_helper (owner, field_name,
field_type->name, &found_class);
field_type->name, found_class);
if (the_field == 0)
{
@ -195,7 +197,7 @@ _Jv_Linker::find_field (jclass klass, jclass owner,
throw new java::lang::NoSuchFieldError (sb->toString());
}
if (_Jv_CheckAccess (klass, found_class, the_field->flags))
if (_Jv_CheckAccess (klass, *found_class, the_field->flags))
{
// Note that the field returned by find_field_helper is always
// resolved. There's no point checking class loaders here,
@ -212,7 +214,7 @@ _Jv_Linker::find_field (jclass klass, jclass owner,
= new java::lang::StringBuffer ();
sb->append(klass->getName());
sb->append(JvNewStringLatin1(": "));
sb->append(found_class->getName());
sb->append((*found_class)->getName());
sb->append(JvNewStringLatin1("."));
sb->append(_Jv_NewStringUtf8Const (field_name));
throw new java::lang::IllegalAccessError(sb->toString());
@ -300,9 +302,13 @@ _Jv_Linker::resolve_pool_entry (jclass klass, int index)
_Jv_Utf8Const *field_name = pool->data[name_index].utf8;
_Jv_Utf8Const *field_type_name = pool->data[type_index].utf8;
_Jv_Field *the_field = find_field (klass, owner, field_name,
jclass found_class = 0;
_Jv_Field *the_field = find_field (klass, owner,
&found_class,
field_name,
field_type_name);
if (owner != found_class)
_Jv_InitClass (found_class);
pool->data[index].field = the_field;
pool->tags[index] |= JV_CONSTANT_ResolvedFlag;
}
@ -967,7 +973,8 @@ _Jv_Linker::link_symbol_table (jclass klass)
// Try fields.
{
wait_for_state(target_class, JV_STATE_PREPARED);
_Jv_Field *the_field = find_field (klass, target_class,
jclass found_class;
_Jv_Field *the_field = find_field (klass, target_class, &found_class,
sym.name, sym.signature);
if ((the_field->flags & java::lang::reflect::Modifier::STATIC))
throw new java::lang::IncompatibleClassChangeError;
@ -1047,7 +1054,8 @@ _Jv_Linker::link_symbol_table (jclass klass)
// Try fields.
{
wait_for_state(target_class, JV_STATE_PREPARED);
_Jv_Field *the_field = find_field (klass, target_class,
jclass found_class;
_Jv_Field *the_field = find_field (klass, target_class, &found_class,
sym.name, sym.signature);
if ((the_field->flags & java::lang::reflect::Modifier::STATIC))
klass->atable->addresses[index] = the_field->u.addr;

16
libjava/prims.cc
View file

@ -359,6 +359,22 @@ _Jv_ThrowNullPointerException ()
throw new java::lang::NullPointerException;
}
// Resolve an entry in the constant pool and return the target
// address.
void *
_Jv_ResolvePoolEntry (jclass this_class, jint index)
{
_Jv_Constants *pool = &this_class->constants;
if ((pool->tags[index] & JV_CONSTANT_ResolvedFlag) != 0)
return pool->data[index].field->u.addr;
JvSynchronize sync (this_class);
return (_Jv_Linker::resolve_pool_entry (this_class, index))
.field->u.addr;
}
// Explicitly throw a no memory exception.
// The collector calls this when it encounters an out-of-memory condition.
void _Jv_ThrowNoMemory()