aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2015-05-25 10:06:46 +0200
committerBjörn Gustavsson <[email protected]>2015-05-25 10:06:46 +0200
commit5dda888b76446a5f9c1a114af2d84600e70e334b (patch)
tree2f1a4e2ce6c100e47a7352d706df14d88a0f688b
parentc09328683871e426f3b6ac0976950d31ff5104df (diff)
parent103d58bf2b941ba850d3280b19fd5475f59f1f57 (diff)
downloadotp-5dda888b76446a5f9c1a114af2d84600e70e334b.tar.gz
otp-5dda888b76446a5f9c1a114af2d84600e70e334b.tar.bz2
otp-5dda888b76446a5f9c1a114af2d84600e70e334b.zip
Merge branch 'bjorn/kernel/code-loading'
* bjorn/kernel/code-loading: code: Eliminate dialyzer warnings for unmatched returns
-rw-r--r--lib/kernel/src/code.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/kernel/src/code.erl b/lib/kernel/src/code.erl
index 5cc38325b1..65045666ec 100644
--- a/lib/kernel/src/code.erl
+++ b/lib/kernel/src/code.erl
@@ -560,12 +560,12 @@ load_native_code_for_all_loaded() ->
try hipe_unified_loader:chunk_name(Architecture) of
ChunkTag ->
Loaded = all_loaded(),
- spawn(fun() -> load_all_native(Loaded, ChunkTag) end)
+ _ = spawn(fun() -> load_all_native(Loaded, ChunkTag) end),
+ ok
catch
_:_ ->
ok
- end,
- ok.
+ end.
load_all_native(Loaded, ChunkTag) ->
catch load_all_native_1(Loaded, ChunkTag).
@@ -582,7 +582,8 @@ load_all_native_1([{Mod,BeamFilename}|T], ChunkTag) ->
undefined ->
ok;
NativeCode when is_binary(NativeCode) ->
- load_native_partial(Mod, NativeCode)
+ _ = load_native_partial(Mod, NativeCode),
+ ok
end;
true -> ok
end,