Mps: now uses correct test for remembering / restoring

SegSummary.

Copied from Perforce
 Change: 64983
 ServerID: perforce.ravenbrook.com

3 files changed, 13 insertions, 1 deletions

diff --git a/mps/code/expt825.c b/mps/code/expt825.c
index 458e0c0870f..db4b4325faa 100644
--- a/mps/code/expt825.c
+++ b/mps/code/expt825.c
@@ -6,6 +6,15 @@
  *
  * DESIGN
  *
+ * Just a copy of finaltest.c with the following modifcations:
+ * maxtreeDEPTH is 2 rather than 12.  This makes the test run and fail
+ * much more quickly.
+ *
+ * After trees have been created and finalized, call
+ * mps_arena_unsafe_expose_remember_protection / restore.  If the bug
+ * is present then this sequence will fail.
+ *
+ *
  * DEPENDENCIES
  *
  * This test uses the dylan object format, but the reliance on this
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index 54ed5f755c5..efd02ca8287 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -610,6 +610,8 @@ extern void SegClassMixInNoSplitMerge(SegClass class);
 #define SEG_SUPERCLASS(className) \
   ((SegClass)SUPERCLASS(className))
 
+#define ClassOfSeg(seg) ((seg)->class)
+
 extern Size SegSize(Seg seg);
 extern Addr (SegBase)(Seg seg);
 extern Addr (SegLimit)(Seg seg);
diff --git a/mps/code/trace.c b/mps/code/trace.c
index 07723fc0bf5..edd7714562f 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -1761,7 +1761,7 @@ void ArenaExposeRemember(Globals globals, int remember)
 
     do {
       base = SegBase(seg);
-      if((SegPool(seg)->class->attr & AttrSCAN) != 0) {
+      if(IsSubclassPoly(ClassOfSeg(seg), GCSegClassGet())) {
         if(remember) {
           RefSet summary;
 
@@ -1805,6 +1805,7 @@ void ArenaRestoreProtection(Globals globals)
       }
       b = SegOfAddr(&seg, arena, block->the[i].base);
       if(b && SegBase(seg) == block->the[i].base) {
+        AVER(IsSubclassPoly(ClassOfSeg(seg), GCSegClassGet()));
         SegSetSummary(seg, block->the[i].summary);
       } else {
         /* Either seg has gone or moved, both of which are