Fix some Dialyzer warnings

Dialyzer recognizes a certain pattern that makes it possible to get
rid of 'The created fun has no local return' warnings.

5 files changed, 48 insertions, 27 deletions

diff --git a/lib/debugger/src/dbg_iload.erl b/lib/debugger/src/dbg_iload.erl
index 266cf239dd..ad05a7c529 100644
--- a/lib/debugger/src/dbg_iload.erl
+++ b/lib/debugger/src/dbg_iload.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2014. 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
@@ -42,18 +42,21 @@
 
 load_mod(Mod, File, Binary, Db) ->
     Flag = process_flag(trap_exit, true),
-    Pid = spawn_link(fun () -> load_mod1(Mod, File, Binary, Db) end),
+    Pid = spawn_link(load_mod1(Mod, File, Binary, Db)),
     receive
 	{'EXIT', Pid, What} ->
 	    process_flag(trap_exit, Flag),
 	    What
     end.
 
--spec load_mod1(atom(), file:filename(), binary(), ets:tid()) -> no_return().
+-spec load_mod1(atom(), file:filename(), binary(), ets:tid()) ->
+                       fun(() -> no_return()).
 
 load_mod1(Mod, File, Binary, Db) ->
-    store_module(Mod, File, Binary, Db),
-    exit({ok, Mod}).
+    fun() ->
+            store_module(Mod, File, Binary, Db),
+            exit({ok, Mod})
+    end.
 
 %%====================================================================
 %% Internal functions
diff --git a/lib/kernel/src/disk_log_server.erl b/lib/kernel/src/disk_log_server.erl
index 684ea5b5db..45334912eb 100644
--- a/lib/kernel/src/disk_log_server.erl
+++ b/lib/kernel/src/disk_log_server.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. 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
@@ -199,7 +199,7 @@ do_open({open, W, #arg{name = Name}=A}=Req, From, State) ->
         false when W =:= local ->
             case A#arg.distributed of
                 {true, Nodes} ->
-                    Fun = fun() -> open_distr_rpc(Nodes, A, From) end,
+                    Fun = open_distr_rpc_fun(Nodes, A, From),
                     _Pid = spawn(Fun),
                     %% No pending reply is expected, but don't reply yet.
                     {pending, State};
@@ -225,11 +225,15 @@ do_open({open, W, #arg{name = Name}=A}=Req, From, State) ->
             end
     end.
 
+-spec open_distr_rpc_fun([node()], _, _) -> % XXX: underspecified
+                                fun(() -> no_return()).
+
+open_distr_rpc_fun(Nodes, A, From) ->
+    fun() -> open_distr_rpc(Nodes, A, From) end.
+
 %% Spawning a process is a means to avoid deadlock when
 %% disk_log_servers mutually open disk_logs.
 
--spec open_distr_rpc([node()], _, _) -> no_return(). % XXX: underspecified
-
 open_distr_rpc(Nodes, A, From) ->
     {AllReplies, BadNodes} = rpc:multicall(Nodes, ?MODULE, dist_open, [A]),
     {Ok, Bad} = cr(AllReplies, [], []),
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index ef878b8d0c..0a4edea452 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2014. 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
@@ -1513,14 +1513,18 @@ delete_global_name(_Name, _Pid) ->
 -record(him, {node, locker, vsn, my_tag}).
 
 start_the_locker(DoTrace) ->
-    spawn_link(fun() -> init_the_locker(DoTrace) end).
-
-init_the_locker(DoTrace) ->
-    process_flag(trap_exit, true),    % needed?
-    S0 = #multi{do_trace = DoTrace},
-    S1 = update_locker_known({add, get_known()}, S0),
-    loop_the_locker(S1),
-    erlang:error(locker_exited).
+    spawn_link(init_the_locker_fun(DoTrace)).
+
+-spec init_the_locker_fun(boolean()) -> fun(() -> no_return()).
+
+init_the_locker_fun(DoTrace) ->
+    fun() ->
+            process_flag(trap_exit, true),    % needed?
+            S0 = #multi{do_trace = DoTrace},
+            S1 = update_locker_known({add, get_known()}, S0),
+            loop_the_locker(S1),
+            erlang:error(locker_exited)
+    end.
 
 loop_the_locker(S) ->
     ?trace({loop_the_locker,S}),
diff --git a/lib/stdlib/src/erl_compile.erl b/lib/stdlib/src/erl_compile.erl
index ed8fea5d78..caed4d41d6 100644
--- a/lib/stdlib/src/erl_compile.erl
+++ b/lib/stdlib/src/erl_compile.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2013. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2014. 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
@@ -66,7 +66,7 @@ my_halt(Reason) ->
 
 compile(List) ->
     process_flag(trap_exit, true),
-    Pid = spawn_link(fun() -> compiler_runner(List) end),
+    Pid = spawn_link(compiler_runner(List)),
     receive
 	{'EXIT', Pid, {compiler_result, Result}} ->
 	    Result;
@@ -79,14 +79,16 @@ compile(List) ->
 	    error
     end.
 
--spec compiler_runner([cmd_line_arg()]) -> no_return().
+-spec compiler_runner([cmd_line_arg()]) -> fun(() -> no_return()).
 
 compiler_runner(List) ->
-    %% We don't want the current directory in the code path.
-    %% Remove it.
-    Path = [D || D <- code:get_path(), D =/= "."],
-    true = code:set_path(Path),
-    exit({compiler_result, compile1(List)}).
+    fun() ->
+            %% We don't want the current directory in the code path.
+            %% Remove it.
+            Path = [D || D <- code:get_path(), D =/= "."],
+            true = code:set_path(Path),
+            exit({compiler_result, compile1(List)})
+    end.
 
 %% Parses the first part of the option list.
 
diff --git a/lib/stdlib/src/escript.erl b/lib/stdlib/src/escript.erl
index 35f6dff57e..a8a82272d6 100644
--- a/lib/stdlib/src/escript.erl
+++ b/lib/stdlib/src/escript.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2007-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2014. 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
@@ -289,6 +289,8 @@ start(EscriptOptions) ->
             my_halt(127)
     end.
 
+-spec parse_and_run(_, _, _) -> no_return().
+
 parse_and_run(File, Args, Options) ->
     CheckOnly = lists:member("s", Options),
     {Source, Module, FormsOrBin, HasRecs, Mode} =
@@ -727,6 +729,8 @@ epp_parse_file2(Epp, S, Forms, Parsed) ->
 %% Evaluate script
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+-spec debug(_, _, _) -> no_return().
+
 debug(Module, AbsMod, Args) ->
     case hidden_apply(debugger, debugger, start, []) of
 	{ok, _} ->
@@ -742,6 +746,8 @@ debug(Module, AbsMod, Args) ->
 	    fatal("Cannot start the debugger")
     end.
 
+-spec run(_, _) -> no_return().
+
 run(Module, Args) ->
     try
         Module:main(Args),
@@ -751,6 +757,8 @@ run(Module, Args) ->
             fatal(format_exception(Class, Reason))
     end.
 
+-spec interpret(_, _, _, _) -> no_return().
+
 interpret(Forms, HasRecs,  File, Args) ->
     %% Basic validation before execution
     case erl_lint:module(Forms) of