1 files changed, 28 insertions, 32 deletions

diff --git a/erts/emulator/hipe/hipe_gc.c b/erts/emulator/hipe/hipe_gc.c
index 86c4068072..d0619a0609 100644
--- a/erts/emulator/hipe/hipe_gc.c
+++ b/erts/emulator/hipe/hipe_gc.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2004-2012. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2016. All Rights Reserved.
  *
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  * %CopyrightEnd%
  */
@@ -22,6 +23,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#define ERL_WANT_GC_INTERNALS__
+
 #include "global.h"
 
 #include "erl_gc.h"
@@ -42,10 +46,6 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
     /* arch-specific nstack walk state */
     struct nstack_walk_state walk_state;
 
-    /* fullsweep-specific state */
-    char *src, *oh;
-    Uint src_size, oh_size;
-
     if (!p->hipe.nstack) {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
 	return n_htop;
@@ -62,11 +62,6 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 
     sdesc = nstack_walk_init_sdesc(p, &walk_state);
 
-    src = (char*)HEAP_START(p);
-    src_size = (char*)HEAP_TOP(p) - src;
-    oh = (char*)OLD_HEAP(p);
-    oh_size = (char*)OLD_HTOP(p) - oh;
-
     for (;;) {
 	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
 	    if (nsp == nsp_end) {
@@ -93,8 +88,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 		    if (IS_MOVED_BOXED(val)) {
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
-		    } else if (in_area(ptr, src, src_size) ||
-			       in_area(ptr, oh, oh_size)) {
+		    } else if (!erts_is_literal(gval, ptr)) {
 			MOVE_BOXED(ptr, val, n_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
@@ -102,8 +96,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 		    Eterm val = *ptr;
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
-		    } else if (in_area(ptr, src, src_size) ||
-			       in_area(ptr, oh, oh_size)) {
+		    } else if (!erts_is_literal(gval, ptr)) {
 			ASSERT(within(ptr, p));
 			MOVE_CONS(ptr, val, n_htop, nsp_i);
 		    }
@@ -135,11 +128,13 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
     unsigned int mask;
     /* arch-specific nstack walk state */
     struct nstack_walk_state walk_state;
+    char *oh;
+    Uint oh_size;
 
     /* gensweep-specific state */
     Eterm *old_htop, *n_htop;
-    char *heap;
-    Uint heap_size, mature_size;
+    char *mature;
+    Uint mature_size;
 
     if (!p->hipe.nstack) {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
@@ -164,9 +159,10 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 
     old_htop = *ptr_old_htop;
     n_htop = *ptr_n_htop;
-    heap = (char*)HEAP_START(p);
-    heap_size = (char*)HEAP_TOP(p) - heap;
-    mature_size = (char*)HIGH_WATER(p) - heap;
+    mature = (char *) (p->abandoned_heap ? p->abandoned_heap : p->heap);
+    mature_size = (char*)HIGH_WATER(p) - mature;
+    oh = (char*)OLD_HEAP(p);
+    oh_size = (char*)OLD_HTOP(p) - oh;
 
     for (;;) {
 	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
@@ -205,9 +201,9 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 		    if (IS_MOVED_BOXED(val)) {
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
-		    } else if (in_area(ptr, heap, mature_size)) {
+		    } else if (ErtsInArea(ptr, mature, mature_size)) {
 			MOVE_BOXED(ptr, val, old_htop, nsp_i);
-		    } else if (in_area(ptr, heap, heap_size)) {
+		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 			ASSERT(within(ptr, p));
 			MOVE_BOXED(ptr, val, n_htop, nsp_i);
 		    }
@@ -216,9 +212,9 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 		    Eterm val = *ptr;
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
-		    } else if (in_area(ptr, heap, mature_size)) {
+		    } else if (ErtsInArea(ptr, mature, mature_size)) {
 			MOVE_CONS(ptr, val, old_htop, nsp_i);
-		    } else if (in_area(ptr, heap, heap_size)) {
+		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
 			ASSERT(within(ptr, p));
 			MOVE_CONS(ptr, val, n_htop, nsp_i);
 		    }