Merge branch 'bjorn/compiler/dialyzer-warnings'

* bjorn/compiler/dialyzer-warnings:
  compile: Eliminate warnings for unmatched return values
  beam_receive: Eliminate dialyzer warning for unmatched return
  beam_validator: Eliminate dialyzer warnings for unmatched returns

3 files changed, 11 insertions, 11 deletions

diff --git a/lib/compiler/src/beam_receive.erl b/lib/compiler/src/beam_receive.erl
index 0bb527aeb9..3dd5ed182e 100644
--- a/lib/compiler/src/beam_receive.erl
+++ b/lib/compiler/src/beam_receive.erl
@@ -249,7 +249,7 @@ opt_ref_used(Is, RefReg, Fail, D) ->
     Done = gb_sets:singleton(Fail),
     Regs = regs_init_x0(),
     try
-	opt_ref_used_1(Is, RefReg, D, Done, Regs),
+	_ = opt_ref_used_1(Is, RefReg, D, Done, Regs),
 	true
     catch
 	throw:not_used ->
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 58aba0b9cc..eb72290306 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -649,7 +649,8 @@ valfun_4(send, Vst) ->
     call(send, 2, Vst);
 valfun_4({set_tuple_element,Src,Tuple,I}, Vst) ->
     assert_term(Src, Vst),
-    assert_type({tuple_element,I+1}, Tuple, Vst);
+    assert_type({tuple_element,I+1}, Tuple, Vst),
+    Vst;
 %% Match instructions.
 valfun_4({select_val,Src,{f,Fail},{list,Choices}}, Vst) ->
     assert_term(Src, Vst),
@@ -1044,7 +1045,7 @@ float_op(Src, Dst, Vst0) ->
 
 assert_fls(Fls, Vst) ->
     case get_fls(Vst) of
-	Fls -> Vst;
+	Fls -> ok;
 	OtherFls -> error({bad_floating_point_state,OtherFls})
     end.
 
@@ -1120,7 +1121,7 @@ bsm_match_state(Slots) ->
     {match_context,0,Slots}.
 
 bsm_validate_context(Reg, Vst) ->
-    bsm_get_context(Reg, Vst),
+    _ = bsm_get_context(Reg, Vst),
     ok.
 
 bsm_get_context({x,X}=Reg, #vst{current=#st{x=Xs}}=_Vst) when is_integer(X) ->
@@ -1133,7 +1134,7 @@ bsm_get_context(Reg, _) -> error({bad_source,Reg}).
 bsm_save(Reg, {atom,start}, Vst) ->
     %% Save point refering to where the match started.
     %% It is always valid. But don't forget to validate the context register.
-    bsm_get_context(Reg, Vst),
+    bsm_validate_context(Reg, Vst),
     Vst;
 bsm_save(Reg, SavePoint, Vst) ->
     case bsm_get_context(Reg, Vst) of
@@ -1146,7 +1147,7 @@ bsm_save(Reg, SavePoint, Vst) ->
 bsm_restore(Reg, {atom,start}, Vst) ->
     %% (Mostly) automatic save point refering to where the match started.
     %% It is always valid. But don't forget to validate the context register.
-    bsm_get_context(Reg, Vst),
+    bsm_validate_context(Reg, Vst),
     Vst;
 bsm_restore(Reg, SavePoint, Vst) ->
     case bsm_get_context(Reg, Vst) of
@@ -1312,8 +1313,7 @@ assert_term(Src, Vst) ->
 %%
 
 assert_type(WantedType, Term, Vst) ->
-    assert_type(WantedType, get_term_type(Term, Vst)),
-    Vst.
+    assert_type(WantedType, get_term_type(Term, Vst)).
 
 assert_type(Correct, Correct) -> ok;
 assert_type(float, {float,_}) -> ok;
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index d2baf51edd..497af2b52c 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -683,7 +683,7 @@ binary_passes() ->
 
 %% Remove the target file so we don't have an old one if the compilation fail.
 remove_file(St) ->
-    file:delete(St#compile.ofile),
+    _ = file:delete(St#compile.ofile),
     {ok,St}.
 
 -record(asm_module, {module,
@@ -1092,7 +1092,7 @@ makedep_output(#compile{code=Code,options=Opts,ofile=Ofile}=St) ->
 		io:fwrite(Output1, "~ts", [Code]),
 		%% Close the file if relevant.
 		if
-		    CloseOutput -> file:close(Output1);
+		    CloseOutput -> ok = file:close(Output1);
 		    true -> ok
 		end,
 		{ok,St}
@@ -1231,7 +1231,7 @@ encrypt(des3_cbc=Mode, {K1,K2,K3, IVec}, Bin0) ->
 
 random_bytes(N) ->
     {A,B,C} = now(),
-    random:seed(A, B, C),
+    _ = random:seed(A, B, C),
     random_bytes_1(N, []).
 
 random_bytes_1(0, Acc) -> Acc;