mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 19:41:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

field.h (JvFieldIsRef): Return false for gnu.gcj.RawData field.

Browse Source 
* gcj/field.h (JvFieldIsRef): Return false for gnu.gcj.RawData
	field.
	* boehm.cc (_Jv_MarkObj): Removed dead code.  Use `STATIC', not
	`0x0008'.
	Include Modifier.h.

From-SVN: r33702
This commit is contained in:
Tom Tromey 2000-05-05 04:46:26 +00:00 committed by Tom Tromey
parent 652f25043a
commit a52dee2f36
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2000-05-04 Tom Tromey <tromey@cygnus.com>
* gcj/field.h (JvFieldIsRef): Return false for gnu.gcj.RawData
field.
* boehm.cc (_Jv_MarkObj): Removed dead code. Use `STATIC', not
`0x0008'.
Include Modifier.h.
2000-05-05 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/natClass.cc (isInstance): Use __builtin_expect.

11
libjava/boehm.cc
View File

@ -16,6 +16,7 @@ details. */
#include <gcj/cni.h>
#include <java/lang/Class.h>
#include <java/lang/reflect/Modifier.h>
#include <java-interp.h>
// More nastiness: the GC wants to define TRUE and FALSE. We don't
@ -102,14 +103,6 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void * /*env*/)
{
jclass c = (jclass) addr;
#if 0
// The next field should probably not be marked, since this is
// only used in the class hash table. Marking this field
// basically prohibits class unloading. --Kresten
p = (ptr_t) c->next;
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c2label);
#endif
p = (ptr_t) c->name;
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c3label);
p = (ptr_t) c->superclass;
@ -182,7 +175,7 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void * /*env*/)
// For the interpreter, we also need to mark the memory
// containing static members
if (field->flags & 0x0008)
if ((field->flags & java::lang::reflect::Modifier::STATIC))
{
p = (ptr_t) field->u.addr;
MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, c8clabel);

4
libjava/gcj/field.h
View File

@ -175,7 +175,9 @@ JvNumStaticFields (jclass klass)
extern inline jboolean
JvFieldIsRef (jfieldID field)
{
return field->isRef ();
// gnu.gcj.RawData.class is _CL_Q33gnu3gcj7RawData
extern java::lang::Class _CL_Q33gnu3gcj7RawData;
return field->isRef () && field->type != &_CL_Q33gnu3gcj7RawData;
}
extern inline jobject