* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33702 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 2 insertions, 9 deletions

diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index 62b9a86fc97..34e95105887 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -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);