5 files changed, 21 insertions, 21 deletions

diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 14ddb74324..023ee3ef4b 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -261,7 +261,7 @@ struct m {
     Binary* code;
     Eterm module;
     Module* modp;
-    Uint exception;
+    Eterm exception;
 };
 
 static Eterm staging_epilogue(Process* c_p, int, Eterm res, int, struct m*, int, int);
@@ -282,7 +282,7 @@ exception_list(Process* p, Eterm tag, struct m* mp, Sint exceptions)
     Eterm res = NIL;
 
     while (exceptions > 0) {
-	if (mp->exception) {
+	if (is_value(mp->exception)) {
 	    res = CONS(hp, mp->module, res);
 	    hp += 2;
 	    exceptions--;
@@ -383,9 +383,9 @@ finish_loading_1(BIF_ALIST_1)
 
     exceptions = 0;
     for (i = 0; i < n; i++) {
-	p[i].exception = 0;
+	p[i].exception = THE_NON_VALUE;
 	if (p[i].modp->seen) {
-	    p[i].exception = 1;
+	    p[i].exception = am_duplicated;
 	    exceptions++;
 	}
 	p[i].modp->seen = 1;
@@ -419,9 +419,9 @@ finish_loading_1(BIF_ALIST_1)
 
     exceptions = 0;
     for (i = 0; i < n; i++) {
-	p[i].exception = 0;
+	p[i].exception = THE_NON_VALUE;
 	if (p[i].modp->curr.code_hdr && p[i].modp->old.code_hdr) {
-	    p[i].exception = 1;
+	    p[i].exception = am_not_purged;
 	    exceptions++;
 	}
     }
@@ -442,7 +442,7 @@ finish_loading_1(BIF_ALIST_1)
 	    retval = erts_finish_loading(p[i].code, BIF_P, 0, &mod);
 	    ASSERT(retval == NIL || retval == am_on_load);
 	    if (retval == am_on_load) {
-		p[i].exception = 1;
+		p[i].exception = am_on_load;
 		exceptions++;
 	    }
 	}
@@ -475,7 +475,8 @@ staging_epilogue(Process* c_p, int commit, Eterm res, int is_blocking,
 	    erts_commit_staging_code_ix();
 
 	    for (i=0; i < nmods; i++) {
-		if (mods[i].modp->curr.code_hdr) {
+		if (mods[i].modp->curr.code_hdr
+                    && mods[i].exception != am_on_load) {
 		    set_default_trace_pattern(mods[i].module);
 		}
 	      #ifdef HIPE
@@ -700,6 +701,7 @@ BIF_RETTYPE delete_module_1(BIF_ALIST_1)
 	Eterm retval;
 	mod.module = BIF_ARG_1;
 	mod.modp = modp;
+        mod.exception = THE_NON_VALUE;
 	retval = staging_epilogue(BIF_P, success, res, is_blocking, &mod, 1, 0);
 	return retval;
     }
diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index b83134c79c..6d4a895ef6 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -3606,14 +3606,8 @@ static SWord proc_cleanup_fixed_table(Process* p, DbFixation* fix)
 	    ASSERT(sizeof(DbFixation) == ERTS_ALC_DBG_BLK_SZ(fix));
 	    ERTS_DB_ALC_MEM_UPDATE_(tb, sizeof(DbFixation), 0);
 	}
-	else {
-	    ASSERT(fix->counter == 0);
-	}
 	db_unlock(tb, LCK_WRITE_REC);
     }
-    else {
-	ASSERT(fix->counter == 0);
-    }
 
     erts_bin_release(fix->tabs.btid);
     erts_free(ERTS_ALC_T_DB_FIXATION, fix);
@@ -3855,11 +3849,8 @@ static void free_fixations_op(DbFixation* fix, void* vctx)
 {
     struct free_fixations_ctx* ctx = (struct free_fixations_ctx*) vctx;
     erts_aint_t diff;
-#ifdef DEBUG
-    DbTable* dbg_tb = btid2tab(fix->tabs.btid);
-#endif
 
-    ASSERT(!dbg_tb || dbg_tb == ctx->tb);
+    ASSERT(!btid2tab(fix->tabs.btid));
     ASSERT(fix->counter > 0);
     ASSERT(ctx->tb->common.status & DB_DELETE);
 
diff --git a/erts/emulator/beam/erl_db_util.h b/erts/emulator/beam/erl_db_util.h
index 19055c6110..7ce104a84c 100644
--- a/erts/emulator/beam/erl_db_util.h
+++ b/erts/emulator/beam/erl_db_util.h
@@ -220,6 +220,9 @@ typedef struct db_fixation {
         Process* p;
     } procs;
 
+    /* Number of fixations on table from procs.p
+     * Protected by table write lock or read lock + fixlock
+     */
     Uint counter;
 } DbFixation;
 
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c
index 1ab1e47254..4d7a86398a 100644
--- a/erts/emulator/beam/erl_port_task.c
+++ b/erts/emulator/beam/erl_port_task.c
@@ -1474,10 +1474,10 @@ erts_port_task_schedule(Eterm id,
     }
 #endif
 
-    if (!pp)
-	goto fail;
-
     if (type != ERTS_PORT_TASK_PROC_SIG) {
+        if (!pp)
+            goto fail;
+
 	ptp = port_task_alloc();
 
 	ptp->type = type;
@@ -1515,6 +1515,9 @@ erts_port_task_schedule(Eterm id,
 	ptp->u.alive.td.psig.callback = va_arg(argp, ErtsProc2PortSigCallback);
  	ptp->u.alive.flags |= va_arg(argp, int);
 	va_end(argp);
+        if (!pp)
+            goto fail;
+
 	if (!(ptp->u.alive.flags & ERTS_PT_FLG_NOSUSPEND))
 	    set_tmp_handle(ptp, pthp);
 	else {
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 22d77ccbdc..b72bac00c1 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -12518,6 +12518,7 @@ erl_create_process(Process* parent, /* Parent of process (default group leader).
     p->msg.first = NULL;
     p->msg.last = &p->msg.first;
     p->msg.save = &p->msg.first;
+    p->msg.saved_last = &p->msg.first;
     p->msg.len = 0;
 #ifdef ERTS_SMP
     p->msg_inq.first = NULL;