6 files changed, 51 insertions, 4 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index fcbeb6cf5c..f3c05d047d 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -1869,6 +1869,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
     } else if (is_external_pid(to)) {
 	dep = external_pid_dist_entry(to);
 	if(dep == erts_this_dist_entry) {
+#if DEBUG
 	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	    erts_dsprintf(dsbufp,
 			  "Discarding message %T from %T to %T in an old "
@@ -1879,6 +1880,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
 			  external_pid_creation(to),
 			  erts_this_node->creation);
 	    erts_send_error_to_logger(p->group_leader, dsbufp);
+#endif
 	    return 0;
 	}
 	return remote_send(p, dep, to, to, msg, suspend);
@@ -1912,6 +1914,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
     } else if (is_external_port(to)
 	       && (external_port_dist_entry(to)
 		   == erts_this_dist_entry)) {
+#if DEBUG
 	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	erts_dsprintf(dsbufp,
 		      "Discarding message %T from %T to %T in an old "
@@ -1922,6 +1925,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
 		      external_port_creation(to),
 		      erts_this_node->creation);
 	erts_send_error_to_logger(p->group_leader, dsbufp);
+#endif
 	return 0;
     } else if (is_internal_port(to)) {
 	int ret_val;
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 011e49f1fe..e68b8e6274 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -601,6 +601,10 @@ bif maps:values/1
 bif erts_internal:cmp_term/2
 
 #
+# New in 17.1.
+#
+bif erlang:fun_info_mfa/1
+#
 # Obsolete
 #
 
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 7d4f52ee23..08265b590d 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -256,6 +256,7 @@ print_process_info(int to, void *to_arg, Process *p)
 		   p->current[1],
 		   p->current[2]);
     }
+    erts_print(to, to_arg, "Run queue: %d\n", erts_get_runq_proc(p)->ix);
 
     erts_print(to, to_arg, "Spawned by: %T\n", p->parent);
     approx_started = (time_t) p->approx_started;
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 05ac24e04d..90cd227fae 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -1873,8 +1873,8 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...)
 	size = va_arg(argp, Uint);
 	va_end(argp);
 	erl_exit(1,
-		 "%s: Cannot %s %lu bytes of memory (of type \"%s\").\n",
-		 allctr_str, op, size, t_str);
+		 "%s: Cannot %s %lu bytes of memory (of type \"%s\", thread %d).\n",
+		 allctr_str, op, size, t_str, ERTS_ALC_GET_THR_IX());
 	break;
     }
     case ERTS_ALC_E_NOALLCTR:
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 6915765dab..6efe9d9550 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -3055,6 +3055,25 @@ fun_info_2(BIF_ALIST_2)
     return TUPLE2(hp, what, val);
 }
 
+BIF_RETTYPE
+fun_info_mfa_1(BIF_ALIST_1)
+{
+    Process* p = BIF_P;
+    Eterm fun = BIF_ARG_1;
+    Eterm* hp;
+
+    if (is_fun(fun)) {
+	ErlFunThing* funp = (ErlFunThing *) fun_val(fun);
+	hp = HAlloc(p, 4);
+	BIF_RET(TUPLE3(hp,funp->fe->module,funp->fe->address[-2],make_small(funp->arity)));
+    } else if (is_export(fun)) {
+	Export* exp = (Export *) ((UWord) (export_val(fun))[1]);
+	hp = HAlloc(p, 4);
+	BIF_RET(TUPLE3(hp,exp->code[0],exp->code[1],make_small(exp->code[2])));
+    }
+    BIF_ERROR(p, BADARG);
+}
+
 BIF_RETTYPE is_process_alive_1(BIF_ALIST_1) 
 {
    if(is_internal_pid(BIF_ARG_1)) {
diff --git a/erts/emulator/test/fun_SUITE.erl b/erts/emulator/test/fun_SUITE.erl
index 8ad5f290ed..2968f5bebb 100644
--- a/erts/emulator/test/fun_SUITE.erl
+++ b/erts/emulator/test/fun_SUITE.erl
@@ -30,7 +30,7 @@
 	 fun_to_port/1,t_hash/1,t_phash/1,t_phash2/1,md5/1,
 	 refc/1,refc_ets/1,refc_dist/1,
 	 const_propagation/1,t_arity/1,t_is_function2/1,
-	 t_fun_info/1]).
+	 t_fun_info/1,t_fun_info_mfa/1]).
 
 -export([nothing/0]).
 
@@ -42,7 +42,8 @@ all() ->
     [bad_apply, bad_fun_call, badarity, ext_badarity,
      equality, ordering, fun_to_port, t_hash, t_phash,
      t_phash2, md5, refc, refc_ets, refc_dist,
-     const_propagation, t_arity, t_is_function2, t_fun_info].
+     const_propagation, t_arity, t_is_function2, t_fun_info,
+     t_fun_info_mfa].
 
 groups() -> 
     [].
@@ -824,6 +825,24 @@ t_fun_info(Config) when is_list(Config) ->
     ?line bad_info(<<1,2>>),
     ok.
 
+t_fun_info_mfa(Config) when is_list(Config) ->
+    Fun1 = fun spawn_call/2,
+    {module,M1}  = erlang:fun_info(Fun1, module),
+    {name,F1}    = erlang:fun_info(Fun1, name),
+    {arity,A1}   = erlang:fun_info(Fun1, arity),
+    {M1,F1,A1=2} = erlang:fun_info_mfa(Fun1),
+    %% Module fun.
+    Fun2 = fun ?MODULE:t_fun_info/1,
+    {module,M2}  = erlang:fun_info(Fun2, module),
+    {name,F2}    = erlang:fun_info(Fun2, name),
+    {arity,A2}   = erlang:fun_info(Fun2, arity),
+    {M2,F2,A2=1} = erlang:fun_info_mfa(Fun2),
+
+    %% Not fun.
+    {'EXIT',_} = (catch erlang:fun_info_mfa(id(d))),
+    ok.
+
+
 bad_info(Term) ->
     try	erlang:fun_info(Term, module) of
 	Any ->