Revert "Extend erlang:port_info/1,2 to show the OS pid of a spawned process"

This reverts commit d4667d383964c1550e0a91d64b674e84f6d07e3b.

This commit was included by mistake, the correct patch will
be merged from maint.

3 files changed, 3 insertions, 9 deletions

diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 8a4ce0fc66..9ee863f9eb 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
@@ -3,5 +3,4 @@ port_info_test.erl:10: The pattern {'connected', 42} can never match the type 'u
 port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the type 'undefined' | {'registered_name',atom()}
 port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()}
 port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed
-port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
-port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid',integer()}
+port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
diff --git a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
index 07f22256c9..2ee9a3a6e2 100644
--- a/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
+++ b/lib/dialyzer/test/small_SUITE_data/src/port_info_test.erl
@@ -3,7 +3,7 @@
 %% and the quality of the warnings that Dialyzer spits out
 %%
 -module(port_info_test).
--export([t1/1, t2/1, t3/1, t4/1, t5/2, t6/1, buggy/1]).
+-export([t1/1, t2/1, t3/1, t4/1, t5/2, buggy/1]).
 
 %% The following errors are correctly caught, but the messages are a bit weird
 t1(X) when is_port(X) ->
@@ -28,10 +28,6 @@ t5(X, Atom) when is_port(X) ->
   {gazonk, _} = erlang:port_info(X, Atom);
 t5(_, _) -> ok.
 
-t6(X) when is_port(X) ->
-  {os_pid, "42"} = erlang:port_info(X, os_pid);
-t6(_) -> ok.
-
 %% The type system is not strong enough to catch the following errors
 buggy(X) when is_atom(X) ->
   {links, X} = erlang:port_info(foo, X).
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index a65b46494e..5c5ffe86e5 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -781,7 +781,6 @@ type(erlang, port_info, 2, Xs) ->
 		     ['input'] -> t_tuple([Item, t_integer()]);
 		     ['links'] -> t_tuple([Item, t_list(t_pid())]);
 		     ['name'] -> t_tuple([Item, t_string()]);
-                     ['os_pid'] -> t_tuple([Item, t_integer()]);
 		     ['output'] -> t_tuple([Item, t_integer()]);
 		     ['registered_name'] -> t_tuple([Item, t_atom()]);
 		     List when is_list(List) ->
@@ -2287,7 +2286,7 @@ arg_types(erlang, port_info, 1) ->
 arg_types(erlang, port_info, 2) ->
   [t_sup(t_port(), t_atom()),
    t_atoms(['registered_name', 'id', 'connected',
-	    'links', 'name', 'input', 'output', 'os_pid'])];
+	    'links', 'name', 'input', 'output'])];
 %% Guard bif, needs to be here.
 arg_types(erlang, round, 1) ->
   [t_number()];