Merge tag 'OTP-20.0' into sverker/20/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 168 insertions, 12 deletions

diff --git a/erts/emulator/hipe/hipe_gc.c b/erts/emulator/hipe/hipe_gc.c
index d0619a0609..1a4a4c7952 100644
--- a/erts/emulator/hipe/hipe_gc.c
+++ b/erts/emulator/hipe/hipe_gc.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2004-2016. All Rights Reserved.
+ * Copyright Ericsson AB 2004-2017. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
     /* known nstack walk state */
     Eterm *nsp;
     Eterm *nsp_end;
-    const struct sdesc *sdesc;
+    const struct hipe_sdesc *sdesc;
     unsigned int sdesc_size;
     unsigned long ra;
     unsigned int i;
@@ -46,6 +46,8 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
     /* arch-specific nstack walk state */
     struct nstack_walk_state walk_state;
 
+    ASSERT(!p->hipe.gc_is_unsafe);
+
     if (!p->hipe.nstack) {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
 	return n_htop;
@@ -89,7 +91,7 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
 		    } else if (!erts_is_literal(gval, ptr)) {
-			MOVE_BOXED(ptr, val, n_htop, nsp_i);
+			move_boxed(&ptr, val, &n_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
 		    Eterm *ptr = list_val(gval);
@@ -97,8 +99,8 @@ Eterm *fullsweep_nstack(Process *p, Eterm *n_htop)
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
 		    } else if (!erts_is_literal(gval, ptr)) {
-			ASSERT(within(ptr, p));
-			MOVE_CONS(ptr, val, n_htop, nsp_i);
+			ASSERT(erts_dbg_within_proc(ptr, p, NULL));
+			move_cons(&ptr, val, &n_htop, nsp_i);
 		    }
 		}
 	    }
@@ -121,7 +123,7 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
     /* known nstack walk state */
     Eterm *nsp;
     Eterm *nsp_end;
-    const struct sdesc *sdesc;
+    const struct hipe_sdesc *sdesc;
     unsigned int sdesc_size;
     unsigned long ra;
     unsigned int i;
@@ -136,6 +138,8 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
     char *mature;
     Uint mature_size;
 
+    ASSERT(!p->hipe.gc_is_unsafe);
+
     if (!p->hipe.nstack) {
 	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
 	return;
@@ -202,10 +206,10 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 			ASSERT(is_boxed(val));
 			*nsp_i = val;
 		    } else if (ErtsInArea(ptr, mature, mature_size)) {
-			MOVE_BOXED(ptr, val, old_htop, nsp_i);
+			move_boxed(&ptr, val, &old_htop, nsp_i);
 		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
-			ASSERT(within(ptr, p));
-			MOVE_BOXED(ptr, val, n_htop, nsp_i);
+			ASSERT(erts_dbg_within_proc(ptr, p, NULL));
+			move_boxed(&ptr, val, &n_htop, nsp_i);
 		    }
 		} else if (is_list(gval)) {
 		    Eterm *ptr = list_val(gval);
@@ -213,10 +217,10 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
 		    if (IS_MOVED_CONS(val)) {
 			*nsp_i = ptr[1];
 		    } else if (ErtsInArea(ptr, mature, mature_size)) {
-			MOVE_CONS(ptr, val, old_htop, nsp_i);
+			move_cons(&ptr, val, &old_htop, nsp_i);
 		    } else if (ErtsInYoungGen(gval, ptr, oh, oh_size)) {
-			ASSERT(within(ptr, p));
-			MOVE_CONS(ptr, val, n_htop, nsp_i);
+			ASSERT(erts_dbg_within_proc(ptr, p, NULL));
+			move_cons(&ptr, val, &n_htop, nsp_i);
 		    }
 		}
 	    }
@@ -233,3 +237,155 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
     }
     abort();
 }
+
+Eterm *sweep_literals_nstack(Process *p, Eterm *old_htop, char *area,
+			     Uint area_size)
+{
+    /* known nstack walk state */
+    Eterm *nsp;
+    Eterm *nsp_end;
+    const struct hipe_sdesc *sdesc;
+    /* arch-specific nstack walk state */
+    struct nstack_walk_state walk_state;
+
+    ASSERT(!p->hipe.gc_is_unsafe);
+
+    if (!p->hipe.nstack) {
+	ASSERT(!p->hipe.nsp && !p->hipe.nstend);
+	return old_htop;
+    }
+    if (!nstack_walk_init_check(p))
+	return old_htop;
+
+    ASSERT(p->hipe.nsp && p->hipe.nstend);
+    nsp = nstack_walk_nsp_begin(p);
+    nsp_end = nstack_walk_nsp_end(p);
+    sdesc = nstack_walk_init_sdesc_ignore_trap(p, &walk_state);
+
+    while (!nstack_walk_nsp_reached_end(nsp, nsp_end)) {
+	unsigned long ra;
+	unsigned sdesc_size = nstack_walk_frame_size(sdesc);
+	unsigned i = 0;
+	unsigned mask = sdesc->livebits[0];
+	for (;;) {
+	    if (mask & 1) {
+		Eterm *nsp_i = nstack_walk_frame_index(nsp, i);
+		Eterm gval = *nsp_i;
+		if (is_boxed(gval)) {
+		    Eterm *ptr = boxed_val(gval);
+		    Eterm val = *ptr;
+		    if (IS_MOVED_BOXED(val)) {
+			ASSERT(is_boxed(val));
+			*nsp_i = val;
+		    } else if (ErtsInArea(ptr, area, area_size)) {
+			move_boxed(&ptr, val, &old_htop, nsp_i);
+		    }
+		} else if (is_list(gval)) {
+		    Eterm *ptr = list_val(gval);
+		    Eterm val = *ptr;
+		    if (IS_MOVED_CONS(val)) {
+			*nsp_i = ptr[1];
+		    } else if (ErtsInArea(ptr, area, area_size)) {
+			move_cons(&ptr, val, &old_htop, nsp_i);
+		    }
+		}
+	    }
+	    if (++i >= sdesc_size)
+		break;
+	    if (i & 31)
+		mask >>= 1;
+	    else
+		mask = sdesc->livebits[i >> 5];
+	}
+	ra = nstack_walk_frame_ra(nsp, sdesc);
+	if (ra == (unsigned long)nbif_stack_trap_ra)
+	    ra = (unsigned long)p->hipe.ngra;
+	sdesc = hipe_find_sdesc(ra);
+	nsp = nstack_walk_next_frame(nsp, sdesc_size);
+    }
+    return old_htop;
+}
+
+int
+nstack_any_heap_ref_ptrs(Process *rp, char* mod_start, Uint mod_size)
+{
+    Eterm *nsp;
+    Eterm *nsp_end;
+    const struct hipe_sdesc *sdesc;
+    /* arch-specific nstack walk state */
+    struct nstack_walk_state walk_state;
+
+    ASSERT(!rp->hipe.gc_is_unsafe);
+
+    if (!rp->hipe.nstack || !nstack_walk_init_check(rp)) return 0;
+    ASSERT(rp->hipe.nsp && rp->hipe.nstend);
+    nsp = nstack_walk_nsp_begin(rp);
+    nsp_end = nstack_walk_nsp_end(rp);
+    sdesc = nstack_walk_init_sdesc_ignore_trap(rp, &walk_state);
+
+    while (!nstack_walk_nsp_reached_end(nsp, nsp_end)) {
+	unsigned long ra;
+	unsigned sdesc_size = nstack_walk_frame_size(sdesc);
+	unsigned i = 0;
+	unsigned mask = sdesc->livebits[0];
+	for (;;) {
+	    if (mask & 1) {
+		Eterm *nsp_i = nstack_walk_frame_index(nsp, i);
+		Eterm val = *nsp_i;
+		switch (primary_tag(val)) {
+		case TAG_PRIMARY_BOXED:
+		case TAG_PRIMARY_LIST:
+		    if (ErtsInArea(val, mod_start, mod_size)) {
+			return 1;
+		    }
+		    break;
+		}
+	    }
+	    if (++i >= sdesc_size)
+		break;
+	    if (i & 31)
+		mask >>= 1;
+	    else
+		mask = sdesc->livebits[i >> 5];
+	}
+	ra = nstack_walk_frame_ra(nsp, sdesc);
+	if (ra == (unsigned long)nbif_stack_trap_ra)
+	    ra = (unsigned long)rp->hipe.ngra;
+	sdesc = hipe_find_sdesc(ra);
+	nsp = nstack_walk_next_frame(nsp, sdesc_size);
+    }
+    return 0;
+}
+
+int
+nstack_any_cps_in_segment(Process *p, char* seg_start, Uint seg_size)
+{
+    Eterm *nsp;
+    Eterm *nsp_end;
+    const struct hipe_sdesc *sdesc;
+    /* arch-specific nstack walk state */
+    struct nstack_walk_state walk_state;
+
+    if (!p->hipe.nstack || !nstack_walk_init_check(p))
+	return 0;
+    ASSERT(p->hipe.nsp && p->hipe.nstend);
+    nsp = nstack_walk_nsp_begin(p);
+    nsp_end = nstack_walk_nsp_end(p);
+    sdesc = nstack_walk_init_sdesc_ignore_trap(p, &walk_state);
+
+    /* Check the topmost frame */
+    if (ErtsInArea(sdesc->bucket.hvalue, seg_start, seg_size))
+	return 1;
+
+    while (!nstack_walk_nsp_reached_end(nsp, nsp_end)) {
+	unsigned sdesc_size = nstack_walk_frame_size(sdesc);
+	unsigned long ra = nstack_walk_frame_ra(nsp, sdesc);
+	if (ra == (unsigned long)nbif_stack_trap_ra)
+	    ra = (unsigned long)p->hipe.ngra;
+	if (ErtsInArea(ra, seg_start, seg_size))
+            return 1;
+        sdesc = hipe_find_sdesc(ra);
+        nsp = nstack_walk_next_frame(nsp, sdesc_size);
+    }
+    return 0;
+}