From 3c1f8725a9df050cee07574e1999f1473a7c7141 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Mon, 27 Mar 2017 19:53:43 -0400
Subject: [PATCH] Flip order of tests.

instruction_ptr_p() can return false positives for holes
in immobile space, which were guarded by the subsequent test,
but it seems clearer to reverse them.
---
 src/runtime/marknsweepgc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/runtime/marknsweepgc.c b/src/runtime/marknsweepgc.c
index e4579cfe9..445daee5e 100644
--- a/src/runtime/marknsweepgc.c
+++ b/src/runtime/marknsweepgc.c
@@ -478,9 +478,9 @@ void immobile_space_preserve_pointer(void* addr)
             && (varyobj_page_gens_augmented(page_index) & (1<<from_space)) != 0
             && (scan_start = varyobj_scan_start(page_index)) <= (lispobj*)addr
             && (object_start = gc_search_space(scan_start, addr)) != 0
+            && !immobile_filler_p(object_start)
             && (instruction_ptr_p(addr, object_start)
-                || properly_tagged_descriptor_p(addr, object_start))
-            && !immobile_filler_p(object_start);
+                || properly_tagged_descriptor_p(addr, object_start));
     } else if (fixedobj_pages[page_index].gens & (1<<from_space)) {
         int obj_spacing = (page_obj_align(page_index) << WORD_SHIFT);
         int obj_index = ((uword_t)addr & (IMMOBILE_CARD_BYTES-1)) / obj_spacing;
-- 
2.11.4.GIT