Mps: adding (null) interface to remember protection state.

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

3 files changed, 31 insertions, 7 deletions

diff --git a/mps/code/mps.h b/mps/code/mps.h
index eb31abab1c1..53edb1a9fed 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -239,6 +239,8 @@ extern void mps_arena_clamp(mps_arena_t);
 extern void mps_arena_release(mps_arena_t);
 extern void mps_arena_park(mps_arena_t);
 extern void mps_arena_expose(mps_arena_t);
+extern void mps_arena_unsafe_expose_remember_protection(mps_arena_t);
+extern void mps_arena_unsafe_restore_protection(mps_arena_t);
 extern mps_res_t mps_arena_start_collect(mps_arena_t);
 extern mps_res_t mps_arena_collect(mps_arena_t);
 extern mps_bool_t mps_arena_step(mps_arena_t, double, double);
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 6c90be25181..c2ebe260712 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -348,6 +348,19 @@ void mps_arena_expose(mps_arena_t mps_arena)
   ArenaLeave(arena);
 }
 
+/* Null implementations of remember and restore */
+void mps_arena_unsafe_expose_remember_protection(mps_arena_t mps_arena)
+{
+  mps_arena_expose(mps_arena);
+}
+
+void mps_arena_unsafe_restore_protection(mps_arena_t mps_arena)
+{
+  Arena arena = (Arena)mps_arena;
+  ArenaEnter(arena);
+  ArenaLeave(arena);
+}
+
 
 mps_res_t mps_arena_start_collect(mps_space_t mps_space)
 {
diff --git a/mps/code/mpsicv.c b/mps/code/mpsicv.c
index e81763cdc0a..80bb31e4caf 100644
--- a/mps/code/mpsicv.c
+++ b/mps/code/mpsicv.c
@@ -366,16 +366,25 @@ static void *test(void *arg, size_t s)
              "all roots check");
       }
       if(collections == 1) {
-        mps_arena_clamp(arena);
-        clamp_until = i + 10000;
+        mps_arena_clamp(arena);
+        clamp_until = i + 10000;
       }
-      if(collections % 3 == 0) {
-        mps_arena_expose(arena);
-        mps_arena_release(arena);
+      if(collections % 6 == 0) {
+        mps_arena_expose(arena);
+        mps_arena_release(arena);
+      }
+      if(collections % 6 == 3) {
+        mps_arena_unsafe_expose_remember_protection(arena);
+        mps_arena_unsafe_restore_protection(arena);
+        mps_arena_release(arena);
+      }
+      if(collections % 6 == 4) {
+        mps_arena_unsafe_expose_remember_protection(arena);
+        mps_arena_release(arena);
       }
       if(collections % 3 == 2) {
-        mps_arena_park(arena);
-        mps_arena_release(arena);
+        mps_arena_park(arena);
+        mps_arena_release(arena);
       }
     }