Merge branch 'rickard/time_api/OTP-11997'

* rickard/time_api/OTP-11997:
  Misc fixes

Conflicts:
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/ebin/erts_internal.beam

4 files changed, 7 insertions, 7 deletions

diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index 7e7ac99b1c..6baa3f9a13 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
diff --git a/erts/preloaded/ebin/erts_internal.beam b/erts/preloaded/ebin/erts_internal.beam
index ad43962b8b..dca75fde95 100644
--- a/erts/preloaded/ebin/erts_internal.beam
+++ b/erts/preloaded/ebin/erts_internal.beam
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 4bbad4df99..fd11c101bc 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1738,7 +1738,7 @@ start_timer(0, Dest, Msg) ->
 		orelse (erlang:is_atom(Dest)
 			andalso Dest /= undefined)),
 	TimerRef = erlang:make_ref(),
-	try Dest ! {timeout, TimerRef, Msg} catch _:_ -> ok end,
+	_ = try Dest ! {timeout, TimerRef, Msg} catch _:_ -> ok end,
 	TimerRef
     catch
 	_:_ ->
diff --git a/erts/preloaded/src/erts_internal.erl b/erts/preloaded/src/erts_internal.erl
index e2c3d40f61..e489001532 100644
--- a/erts/preloaded/src/erts_internal.erl
+++ b/erts/preloaded/src/erts_internal.erl
@@ -249,7 +249,7 @@ create_bif_timer() ->
 
 -spec erts_internal:access_bif_timer(Ref) -> Res when
       Ref :: reference(),
-      Res :: {reference(), pid(), reference()}.
+      Res :: {reference(), pid()} | 'undefined'.
 
 access_bif_timer(_Ref) ->
     erlang:nif_error(undefined).
@@ -369,7 +369,7 @@ tsrv_handle_msg({cancel_timeout, BTR, From, Reply, Req, TRef},
 		false ->
 		    ok;
 		_ ->
-		    try From ! {cancel_timer, Req, false} catch _:_ -> ok end
+		    _ = try From ! {cancel_timer, Req, false} catch _:_ -> ok end
 	    end,
 	    Nxt;
 	[{Time, TRef} = TKey] ->
@@ -387,7 +387,7 @@ tsrv_handle_msg({cancel_timeout, BTR, From, Reply, Req, TRef},
 			     false ->
 				 ((1000*(Time - RcvTime)) div Unit)
 			 end,
-		    try From ! {cancel_timer, Req, RT} catch _:_ -> ok end
+		    _ = try From ! {cancel_timer, Req, RT} catch _:_ -> ok end
 	    end,
 	    case Time =:= Nxt of
 		false ->
@@ -406,14 +406,14 @@ tsrv_handle_msg({read_timeout, BTR, From, Req, TRef},
 		Nxt) ->
     case ets:lookup(RTab, TRef) of
 	[] ->
-	    try From ! {read_timer, Req, false} catch _:_ -> ok end;
+	    _ = try From ! {read_timer, Req, false} catch _:_ -> ok end;
 	[{Time, TRef}] ->
 	    RcvTime = erlang:monotonic_time(),
 	    RT = case Time =< RcvTime of
 		     true -> 0;
 		     false -> (1000*(Time - RcvTime)) div Unit
 		 end,
-	    try From ! {read_timer, Req, RT} catch _:_ -> ok end
+	    _ = try From ! {read_timer, Req, RT} catch _:_ -> ok end
     end,
     Nxt;
 tsrv_handle_msg({'DOWN', TRef, process, _, _},
@@ -473,6 +473,6 @@ tsrv_handle_timeout(CallTime, #tsrv_state{rtab = RTab,
 	    end,
 	    ets:delete(TTab, TKey),
 	    ets:delete(RTab, TRef),
-	    try Proc ! Msg catch _:_ -> ok end,
+	    _ = try Proc ! Msg catch _:_ -> ok end,
 	    tsrv_handle_timeout(CallTime, S)
     end.