Merge branch 'dev' into major

2 files changed, 34 insertions, 4 deletions

diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c
index 16f8fb1347..e3e8367b62 100644
--- a/erts/emulator/hipe/hipe_mode_switch.c
+++ b/erts/emulator/hipe/hipe_mode_switch.c
@@ -346,7 +346,12 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	      p->arity = callee_arity;
           }
 
-	  /* If process is in P_WAITING state, we schedule the next process */
+	  /* Schedule next process if current process was hibernated or is waiting
+	     for messages */
+	  if (p->flags & F_HIBERNATE_SCHED) {
+	      p->flags &= ~F_HIBERNATE_SCHED;
+	      goto do_schedule;
+	  }
 	  if (p->status == P_WAITING) {
 	      goto do_schedule;
 	  }
diff --git a/erts/emulator/test/hibernate_SUITE.erl b/erts/emulator/test/hibernate_SUITE.erl
index 203fa6b48e..82a0aad189 100644
--- a/erts/emulator/test/hibernate_SUITE.erl
+++ b/erts/emulator/test/hibernate_SUITE.erl
@@ -25,16 +25,16 @@
 	 init_per_group/2,end_per_group/2,
 	 init_per_testcase/2,end_per_testcase/2,
 	 basic/1,dynamic_call/1,min_heap_size/1,bad_args/1,
-	 messages_in_queue/1,undefined_mfa/1, no_heap/1]).
+	 messages_in_queue/1,undefined_mfa/1,no_heap/1,wake_up_and_bif_trap/1]).
 
 %% Used by test cases.
--export([basic_hibernator/1,dynamic_call_hibernator/2,messages_in_queue_restart/2, no_heap_loop/0]).
+-export([basic_hibernator/1,dynamic_call_hibernator/2,messages_in_queue_restart/2, no_heap_loop/0,characters_to_list_trap/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, dynamic_call, min_heap_size, bad_args, messages_in_queue,
-     undefined_mfa, no_heap].
+     undefined_mfa, no_heap, wake_up_and_bif_trap].
 
 groups() -> 
     [].
@@ -384,6 +384,31 @@ clean_dict() ->
     lists:foreach(fun ({Key, _}) -> erase(Key) end, Dict).
 
 %%
+%% Wake up and then immediatly bif trap with a lengthy computation.
+%%
+
+wake_up_and_bif_trap(doc) -> [];
+wake_up_and_bif_trap(suite) -> [];
+wake_up_and_bif_trap(Config) when is_list(Config) ->
+    ?line Self = self(),
+    ?line Pid = spawn_link(fun() -> erlang:hibernate(?MODULE, characters_to_list_trap, [Self]) end),
+    ?line Pid ! wakeup,
+    ?line receive
+        {ok, Pid0} when Pid0 =:= Pid -> ok
+    after 5000 ->
+        ?line ?t:fail(process_blocked)
+    end,
+    ?line unlink(Pid),
+    ?line exit(Pid, bye).
+
+%% Lengthy computation that traps (in characters_to_list_trap_3).
+characters_to_list_trap(Parent) ->
+    Bin0 = <<"abcdefghijklmnopqrstuvwxz0123456789">>,
+    Bin = binary:copy(Bin0, 1500),
+    unicode:characters_to_list(Bin),
+    Parent ! {ok, self()}.
+
+%%
 %% Misc
 %%