master: Remove ENABLE_PAGE_PROTECTION choice from immobile-space

snuglas via Sbcl-commits <[email protected]>
Newsgroups gmane.lisp.steel-bank.cvs
Message-ID <[email protected]>
The branch "master" has been updated in SBCL:
       via  1da3c086e78ecd94ef28c255d8692f147ac41006 (commit)
      from  36c8443d71c10920f798fd712c21777b7e10dd94 (commit)

- Log -----------------------------------------------------------------
commit 1da3c086e78ecd94ef28c255d8692f147ac41006
Author: Douglas Katzman <[email protected]>
Date:   Tue Apr 7 23:01:23 2026 -0400

    Remove ENABLE_PAGE_PROTECTION choice from immobile-space
---
 src/runtime/immobile-space.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/runtime/immobile-space.c b/src/runtime/immobile-space.c
index 0bcab8f74..de396634e 100644
--- a/src/runtime/immobile-space.c
+++ b/src/runtime/immobile-space.c
@@ -962,7 +962,7 @@ sweep_fixedobj_pages(int raise)
         // we try to do less work than for pages that need it.
         if (!(fixedobj_pages[page].gens & relevant_genmask)) {
             // Scan for old->young pointers, and WP if there are none.
-            if (ENABLE_PAGE_PROTECTION && !fixedobj_page_wp(page)
+            if (!fixedobj_page_wp(page)
                 && fixedobj_pages[page].gens > 1
                 && can_wp_fixedobj_page(page, keep_gen, new_gen)) {
                 SET_WP_FLAG(page, WRITE_PROTECT);
@@ -981,7 +981,7 @@ sweep_fixedobj_pages(int raise)
 
         // wp_it is 1 if we should try to write-protect it now.
         // If already write-protected, skip the tests.
-        int wp_it = ENABLE_PAGE_PROTECTION && !fixedobj_page_wp(page);
+        int wp_it = !fixedobj_page_wp(page);
         int gen;
         do {
             if (fixnump(*obj)) { // was already a hole
@@ -1050,7 +1050,7 @@ sweep_text_pages(int raise)
         int genmask = text_page_genmask[page];
         if (!(genmask & relevant_genmask)) { // Has nothing in oldspace or newspace.
             // Scan for old->young pointers, and WP if there are none.
-            if (ENABLE_PAGE_PROTECTION && text_page_touched(page)
+            if (text_page_touched(page)
                 && text_page_genmask[page] > 1
                 && can_wp_text_page(page)) {
                 text_page_touched_bits[page/32] &= ~(1U<<(page & 31));
@@ -1065,7 +1065,7 @@ sweep_text_pages(int raise)
         int any_kept = 0; // was anything moved to the kept generation
         // wp_it is 1 if we should try to write-protect it now.
         // If already write-protected, skip the tests.
-        int wp_it = ENABLE_PAGE_PROTECTION && text_page_touched(page);
+        int wp_it = text_page_touched(page);
         sword_t size;
         int gen;
 
@@ -1186,7 +1186,7 @@ void immobile_space_coreparse(uword_t fixedobj_len,
                 sword_t size = object_size2(obj, header);
                 fixedobj_pages[page].attr.parts.obj_align = size;
                 fixedobj_pages[page].gens |= 1 << immobile_obj_gen_bits(obj);
-                if (gen != 0 && ENABLE_PAGE_PROTECTION)
+                if (gen != 0)
                     fixedobj_pages[page].attr.parts.flags = WRITE_PROTECT;
                 break;
             }
@@ -1234,7 +1234,7 @@ void immobile_space_coreparse(uword_t fixedobj_len,
 
     // Set the WP bits for pages occupied by the core file.
     // (There can be no inter-generation pointers.)
-    if (gen != 0 && ENABLE_PAGE_PROTECTION) {
+    if (gen != 0) {
         low_page_index_t page;
         for (page = 0 ; page <= n_pages ; ++page)
             text_page_touched_bits[page/32] &= ~(1U<<(page & 31));

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.