Merge branch 'rickard/inet_db/OTP-11074' into maint

* rickard/inet_db/OTP-11074:
  Do not treat port_set_data/port_get_data as signals

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

1 files changed, 4 insertions, 16 deletions

diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index fefe0f21e0..020730efcb 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2705,26 +2705,14 @@ port_info(Port, Item) ->
       Port :: port() | atom(),
       Data :: term().
     
-port_set_data(Port, Data) ->
-    case case erts_internal:port_set_data(Port, Data) of
-	     Ref when erlang:is_reference(Ref) -> receive {Ref, Res} -> Res end;
-	     Res -> Res
-	 end of
-	badarg -> erlang:error(badarg, [Port, Data]);
-	Result -> Result
-    end.
+port_set_data(_Port, _Data) ->
+    erlang:nif_error(undefined).
 
 -spec erlang:port_get_data(Port) -> term() when
       Port :: port() | atom().
 
-port_get_data(Port) ->
-    case case erts_internal:port_get_data(Port) of
-	     Ref when erlang:is_reference(Ref) -> receive {Ref, Res} -> Res end;
-	     Res -> Res
-	 end of
-	{ok, Data} -> Data;
-	Error -> erlang:error(Error, [Port])
-    end.
+port_get_data(_Port) ->
+    erlang:nif_error(undefined).
 
 %%
 %% If the emulator wants to perform a distributed command and