Remove pre-defined types dict(), digraph(), &c

The pre-defined types array(), dict(), digraph(), gb_set(), gb_tree(),
queue(), set(), and tid() have been removed.

9 files changed, 37 insertions, 269 deletions

diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index e0873b17f8..bb5604cd5f 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -2770,8 +2770,7 @@ filter_match_fail([]) ->
 %%% ===========================================================================
 
 state__new(Callgraph, Tree, Plt, Module, Records) ->
-  Opaques = erl_types:module_builtin_opaques(Module) ++
-    erl_types:t_opaque_from_records(Records),
+  Opaques = erl_types:t_opaque_from_records(Records),
   TreeMap = build_tree_map(Tree),
   Funs = dict:fetch_keys(TreeMap),
   FunTab = init_fun_tab(Funs, dict:new(), TreeMap, Callgraph, Plt),
diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl
index fa034816a4..6dc4285194 100644
--- a/lib/dialyzer/src/dialyzer_succ_typings.erl
+++ b/lib/dialyzer/src/dialyzer_succ_typings.erl
@@ -422,10 +422,7 @@ lookup_and_find_opaques_fun(Codeserver) ->
   end.
 
 find_opaques_fun(Records) ->
-  fun(Module) ->
-      erl_types:module_builtin_opaques(Module) ++
-      erl_types:t_opaque_from_records(Records)
-  end.
+  fun(_Module) -> erl_types:t_opaque_from_records(Records) end.
 
 get_fun_types_from_plt(FunList, Callgraph, Plt) ->
   get_fun_types_from_plt(FunList, Callgraph, Plt, dict:new()).
diff --git a/lib/dialyzer/test/small_SUITE_data/src/predef2.erl b/lib/dialyzer/test/small_SUITE_data/src/predef2.erl
deleted file mode 100644
index b1d941a49a..0000000000
--- a/lib/dialyzer/test/small_SUITE_data/src/predef2.erl
+++ /dev/null
@@ -1,56 +0,0 @@
--module(predef2).
-
--export([array/1, dict/1, digraph/1, digraph2/1, gb_set/1, gb_tree/1,
-         queue/1, set/1, tid/0, tid2/0]).
-
--export_type([array/0, digraph/0, gb_set/0]).
-
--spec array(array()) -> array:array().
-
-array(A) ->
-    array:relax(A).
-
--spec dict(dict()) -> dict:dict().
-
-dict(D) ->
-    dict:store(1, a, D).
-
--spec digraph(digraph()) -> [digraph:edge()].
-
-digraph(G) ->
-    digraph:edges(G).
-
--spec digraph2(digraph:graph()) -> [digraph:edge()].
-
-digraph2(G) ->
-    digraph:edges(G).
-
--spec gb_set(gb_set()) -> gb_sets:set().
-
-gb_set(S) ->
-    gb_sets:balance(S).
-
--spec gb_tree(gb_tree()) -> gb_trees:tree().
-
-gb_tree(S) ->
-    gb_trees:balance(S).
-
--spec queue(queue()) -> queue:queue().
-
-queue(Q) ->
-    queue:reverse(Q).
-
--spec set(set()) -> sets:set().
-
-set(S) ->
-    sets:union([S]).
-
--spec tid() -> tid().
-
-tid() ->
-    ets:new(tid, []).
-
--spec tid2() -> ets:tid().
-
-tid2() ->
-    ets:new(tid, []).
diff --git a/lib/hipe/cerl/erl_types.erl b/lib/hipe/cerl/erl_types.erl
index 473a9eba4a..939cc37ad6 100644
--- a/lib/hipe/cerl/erl_types.erl
+++ b/lib/hipe/cerl/erl_types.erl
@@ -40,7 +40,6 @@
 	 any_none_or_unit/1,
 	 lookup_record/3,
 	 max/2,
-	 module_builtin_opaques/1,
 	 min/2,
 	 number_max/1, number_max/2,
 	 number_min/1, number_min/2,
@@ -188,7 +187,6 @@
 	 t_subtract_list/2,
 	 t_sup/1,
 	 t_sup/2,
-	 t_tid/0,
 	 t_timeout/0,
 	 t_to_string/1,
 	 t_to_string/2,
@@ -463,16 +461,6 @@ has_opaque_subtype(T) ->
 t_opaque_structure(?opaque(Elements)) ->
   t_sup([Struct || #opaque{struct = Struct} <- ordsets:to_list(Elements)]).
 
--spec t_opaque_modules(erl_type()) -> [module()].
-
-t_opaque_modules(?opaque(Elements)) ->
-  case ordsets:size(Elements) of
-    1 ->
-      [#opaque{mod = Mod}] = set_to_list(Elements),
-      [Mod];
-    _ -> throw({error, "Unexpected multiple opaque types"})
-  end.
-
 -spec t_contains_opaque(erl_type()) -> boolean().
 
 t_contains_opaque(Type) ->
@@ -786,11 +774,6 @@ t_struct_from_opaque(Type, _Opaques) -> Type.
 list_struct_from_opaque(Types, Opaques) ->
   [t_struct_from_opaque(Type, Opaques) || Type <- Types].
 
--spec module_builtin_opaques(module()) -> [erl_type()].
-
-module_builtin_opaques(Module) ->
-  [O || O <- all_opaque_builtins(), lists:member(Module, t_opaque_modules(O))].
-
 %%-----------------------------------------------------------------------------
 %% Remote types: these types are used for preprocessing;
 %% they should never reach the analysis stage.
@@ -1971,82 +1954,6 @@ t_parameterized_module() ->
 t_timeout() ->
   t_sup(t_non_neg_integer(), t_atom('infinity')).
 
-%%-----------------------------------------------------------------------------
-%% Some built-in opaque types
-%%
-
--spec t_array() -> erl_type().
-
-t_array() ->
-  t_opaque(array, array, [t_any()],
-	   t_tuple([t_atom('array'),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-                    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-		    t_any(),
-                    t_any()])).
-
--spec t_dict() -> erl_type().
-
-t_dict() ->
-  t_opaque(dict, dict, [t_any(), t_any()],
-	   t_tuple([t_atom('dict'),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-		    t_sup([t_atom('undefined'), t_non_neg_integer()]),
-                    t_sup([t_atom('undefined'), t_tuple()]),
-                    t_sup([t_atom('undefined'), t_tuple()])])).
-
--spec t_digraph() -> erl_type().
-
-t_digraph() ->
-  t_opaque(digraph, digraph, [],
-	   t_tuple([t_atom('digraph'),
-		    t_sup(t_atom(), t_tid()),
-		    t_sup(t_atom(), t_tid()),
-		    t_sup(t_atom(), t_tid()),
-		    t_boolean()])).
-
--spec t_gb_set() -> erl_type().
-
-t_gb_set() ->
-  t_opaque(gb_sets, gb_set, [],
-	   t_tuple([t_non_neg_integer(), t_sup(t_atom('nil'), t_tuple(3))])).
-
--spec t_gb_tree() -> erl_type().
-
-t_gb_tree() ->
-  t_opaque(gb_trees, gb_tree, [],
-	   t_tuple([t_non_neg_integer(), t_sup(t_atom('nil'), t_tuple(4))])).
-
--spec t_queue() -> erl_type().
-
-t_queue() ->
-  t_opaque(queue, queue, [t_any()], t_tuple([t_list(), t_list()])).
-
--spec t_set() -> erl_type().
-
-t_set() ->
-  t_opaque(sets, set, [t_any()],
-	   t_tuple([t_atom('set'), t_non_neg_integer(), t_non_neg_integer(),
-		    t_pos_integer(), t_non_neg_integer(), t_non_neg_integer(),
-		    t_non_neg_integer(),
-                    t_sup([t_atom('undefined'), t_tuple()]),
-                    t_sup([t_atom('undefined'), t_tuple()])])).
-
--spec t_tid() -> erl_type().
-
-t_tid() ->
-  t_opaque(ets, tid, [], t_integer()).
-
--spec all_opaque_builtins() -> [erl_type(),...].
-
-all_opaque_builtins() ->
-  [t_array(), t_dict(), t_digraph(), t_gb_set(),
-   t_gb_tree(), t_queue(), t_set(), t_tid()].
-
 %%------------------------------------
 
 %% ?none is allowed in products. A product of size 1 is not a product.
@@ -3289,8 +3196,8 @@ is_opaque_type2(#opaque{mod = Mod1, name = Name1, args = Args1}, Opaques) ->
 
 is_type_name(Mod, Name, Args1, Mod, Name, Args2) ->
   length(Args1) =:= length(Args2);
-is_type_name(Mod1, Name1, Args1, Mod2, Name2, Args2) ->
-  is_same_type_name2(Mod1, Name1, Args1, Mod2, Name2, Args2).
+is_type_name(_Mod1, _Name1, _Args1, _Mod2, _Name2, _Args2) ->
+  false.
 
 %% Two functions since t_unify is not symmetric.
 unify_tuple_set_and_tuple1(?tuple_set([{Arity, List}]),
@@ -4128,15 +4035,7 @@ opaque_name(Mod, Name, Extra) ->
   flat_format("~s(~s)", [S, Extra]).
 
 mod_name(Mod, Name) ->
-  case is_obsolete_opaque_builtin(Mod, Name) of
-    true  -> flat_format("~w", [Name]);
-    false -> flat_format("~w:~w", [Mod, Name])
-  end.
-
-is_obsolete_opaque_builtin(digraph, digraph) -> true;
-is_obsolete_opaque_builtin(gb_sets, gb_set) -> true;
-is_obsolete_opaque_builtin(gb_trees, gb_tree) -> true;
-is_obsolete_opaque_builtin(_, _) -> false.
+  flat_format("~w:~w", [Mod, Name]).
 
 %%=============================================================================
 %% 
@@ -4201,8 +4100,6 @@ t_from_form({type, _L, any, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_any(), []};
 t_from_form({type, _L, arity, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_arity(), []};
-t_from_form({type, _L, array, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(array, t_array(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, atom, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_atom(), []};
 t_from_form({type, _L, binary, []}, _TypeNames, _RecDict, _VarDict) ->
@@ -4224,10 +4121,6 @@ t_from_form({type, _L, byte, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_byte(), []};
 t_from_form({type, _L, char, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_char(), []};
-t_from_form({type, _L, dict, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(dict, t_dict(), TypeNames, RecDict, VarDict);
-t_from_form({type, _L, digraph, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(digraph, t_digraph(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, float, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_float(), []};
 t_from_form({type, _L, function, []}, _TypeNames, _RecDict, _VarDict) ->
@@ -4243,10 +4136,6 @@ t_from_form({type, _L, 'fun', [{type, _, product, Domain}, Range]},
   {L, R1} = list_from_form(Domain, TypeNames, RecDict, VarDict),
   {T, R2} = t_from_form(Range, TypeNames, RecDict, VarDict),
   {t_fun(L, T), R1 ++ R2};
-t_from_form({type, _L, gb_set, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(gb_set, t_gb_set(), TypeNames, RecDict, VarDict);
-t_from_form({type, _L, gb_tree, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(gb_tree, t_gb_tree(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, identifier, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_identifier(), []};
 t_from_form({type, _L, integer, []}, _TypeNames, _RecDict, _VarDict) ->
@@ -4319,8 +4208,6 @@ t_from_form({type, _L, maybe_improper_list, [Content, Termination]},
 t_from_form({type, _L, product, Elements}, TypeNames, RecDict, VarDict) ->
   {L, R} = list_from_form(Elements, TypeNames, RecDict, VarDict),
   {t_product(L), R};
-t_from_form({type, _L, queue, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(queue, t_queue(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, range, [From, To]} = Type,
 	    _TypeNames, _RecDict, _VarDict) ->
   case {erl_eval:partial_eval(From), erl_eval:partial_eval(To)} of
@@ -4332,14 +4219,10 @@ t_from_form({type, _L, record, [Name|Fields]}, TypeNames, RecDict, VarDict) ->
   record_from_form(Name, Fields, TypeNames, RecDict, VarDict);
 t_from_form({type, _L, reference, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_reference(), []};
-t_from_form({type, _L, set, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(set, t_set(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, string, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_string(), []};
 t_from_form({type, _L, term, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_any(), []};
-t_from_form({type, _L, tid, []}, TypeNames, RecDict, VarDict) ->
-  builtin_type(tid, t_tid(), TypeNames, RecDict, VarDict);
 t_from_form({type, _L, timeout, []}, _TypeNames, _RecDict, _VarDict) ->
   {t_timeout(), []};
 t_from_form({type, _L, tuple, any}, _TypeNames, _RecDict, _VarDict) ->
@@ -4353,7 +4236,7 @@ t_from_form({type, _L, union, Args}, TypeNames, RecDict, VarDict) ->
 t_from_form({user_type, _L, Name, Args}, TypeNames, RecDict, VarDict) ->
   type_from_form(Name, Args, TypeNames, RecDict, VarDict);
 t_from_form({type, _L, Name, Args}, TypeNames, RecDict, VarDict) ->
-  %% Compatibility. Modules compiled before 18.0.
+  %% Compatibility: modules compiled before Erlang/OTP 18.0.
   type_from_form(Name, Args, TypeNames, RecDict, VarDict);
 t_from_form({opaque, _L, Name, {Mod, Args, Rep}}, _TypeNames,
             _RecDict, _VarDict) ->
@@ -4595,7 +4478,7 @@ t_form_to_string({user_type, _L, Name, List}) ->
   flat_format("~w(~s)",
               [Name, string:join(t_form_to_string_list(List), ",")]);
 t_form_to_string({type, L, Name, List}) ->
-  %% Compatibility. Modules compiled before 18.0.
+  %% Compatibility: modules compiled before Erlang/OTP 18.0.
   t_form_to_string({user_type, L, Name, List}).
 
 t_form_to_string_list(List) ->
@@ -4709,27 +4592,14 @@ do_opaque(Type, _Opaques, Pred) ->
 is_same_type_name(ModNameArgs, ModNameArgs) -> true;
 is_same_type_name({Mod, Name, Args1}, {Mod, Name, Args2}) ->
   all_any(Args1) orelse all_any(Args2);
-is_same_type_name({Mod1, Name1, Args1}, {Mod2, Name2, Args2}) ->
-  is_same_type_name2(Mod1, Name1, Args1, Mod2, Name2, Args2).
+is_same_type_name(_ModNameArgs1, _ModNameArgs2) ->
+  false.
 
 all_any([]) -> true;
 all_any([T|L]) ->
   t_is_any(T) andalso all_any(L);
 all_any(_) -> false.
 
-%% Compatibility. In Erlang/OTP 17 the pre-defined opaque types
-%% digraph() and so on can be used, but there are also new types such
-%% as digraph:graph() with the exact same meaning. In Erlang/OTP R18.0
-%% all but the last clause can be removed.
-
-is_same_type_name2(digraph,  digraph, [], digraph,  graph, [])   -> true;
-is_same_type_name2(digraph,  graph, [],   digraph,  digraph, []) -> true;
-is_same_type_name2(gb_sets,  gb_set, [],  gb_sets,  set, [_]) -> true;
-is_same_type_name2(gb_sets,  set, [_], gb_sets,  gb_set, [])  -> true;
-is_same_type_name2(gb_trees, gb_tree, [], gb_trees, tree, [_, _]) -> true;
-is_same_type_name2(gb_trees, tree, [_, _], gb_trees, gb_tree, []) -> true;
-is_same_type_name2(_, _, _, _, _, _) -> false.
-
 map_keys(?map(Pairs)) ->
   [K || {K, _} <- Pairs].
 
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 2410f1f9b8..0fde763bfb 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -5,7 +5,7 @@
   <header>
     <copyright>
       <year>2009</year>
-      <year>2013</year>
+      <year>2014</year>
       <holder>Ericsson AB, All Rights Reserved</holder>
     </copyright>
     <legalnotice>
@@ -450,7 +450,7 @@ store(Binary, GBSet) ->
       </code>
 
       <p>In this example, we chose to copy the binary content before
-      inserting it in the <c>gb_set()</c> if it references a binary more than
+      inserting it in the <c>gb_sets:set()</c> if it references a binary more than
       twice the size of the data we're going to keep. Of course
       different rules for when copying will apply to different
       programs.</p>
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index 5e6391da1f..e523b6b476 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -540,7 +540,6 @@ old_bif(Name, A) when is_atom(Name), is_integer(A) -> false.
 
 is_type(any, 0) -> true;
 is_type(arity, 0) -> true;
-is_type(array, 0) -> true; % To be removed.
 is_type(atom, 0) -> true;
 is_type(binary, 0) -> true;
 is_type(bitstring, 0) -> true;
@@ -548,12 +547,8 @@ is_type(bool, 0) -> true;
 is_type(boolean, 0) -> true;
 is_type(byte, 0) -> true;
 is_type(char, 0) -> true;
-is_type(dict, 0) -> true; % To be removed.
-is_type(digraph, 0) -> true; % To be removed.
 is_type(float, 0) -> true;
 is_type(function, 0) -> true;
-is_type(gb_set, 0) -> true; % To be removed.
-is_type(gb_tree, 0) -> true; % To be removed.
 is_type(identifier, 0) -> true;
 is_type(integer, 0) -> true;
 is_type(iodata, 0) -> true;
@@ -581,12 +576,9 @@ is_type(number, 0) -> true;
 is_type(pid, 0) -> true;
 is_type(port, 0) -> true;
 is_type(pos_integer, 0) -> true;
-is_type(queue, 0) -> true; % To be removed.
 is_type(reference, 0) -> true;
-is_type(set, 0) -> true; % To be removed.
 is_type(string, 0) -> true;
 is_type(term, 0) -> true;
-is_type(tid, 0) -> true; % To be removed.
 is_type(timeout, 0) -> true;
 is_type(tuple, 0) -> true;
 is_type(_, _) -> false.
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 10ed9c27e1..f34c3b5c7b 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -2852,23 +2852,9 @@ is_newly_introduced_builtin_type({Name, _}) when is_atom(Name) -> false.
 is_obsolete_builtin_type(TypePair) ->
     obsolete_builtin_type(TypePair) =/= no.
 
-%% Obsolete in OTP 17.0.
-obsolete_builtin_type({array, 0}) ->
-    {deprecated, {array, array, 1}, "OTP 18.0"};
-obsolete_builtin_type({dict, 0}) ->
-    {deprecated, {dict, dict, 2}, "OTP 18.0"};
-obsolete_builtin_type({digraph, 0}) ->
-    {deprecated, {digraph, graph}, "OTP 18.0"};
-obsolete_builtin_type({gb_set, 0}) ->
-    {deprecated, {gb_sets, set, 1}, "OTP 18.0"};
-obsolete_builtin_type({gb_tree, 0}) ->
-    {deprecated, {gb_trees, tree, 2}, "OTP 18.0"};
-obsolete_builtin_type({queue, 0}) ->
-    {deprecated, {queue, queue, 1}, "OTP 18.0"};
-obsolete_builtin_type({set, 0}) ->
-    {deprecated, {sets, set, 1}, "OTP 18.0"};
-obsolete_builtin_type({tid, 0}) ->
-    {deprecated, {ets, tid}, "OTP 18.0"};
+%% To keep Dialyzer silent...
+obsolete_builtin_type({1, 255}) ->
+    {deprecated, {2, 255}, ""};
 obsolete_builtin_type({Name, A}) when is_atom(Name), is_integer(A) -> no.
 
 %% spec_decl(Line, Fun, Types, State) -> State.
diff --git a/lib/stdlib/test/erl_lint_SUITE.erl b/lib/stdlib/test/erl_lint_SUITE.erl
index 5db0631f58..ca91d94213 100644
--- a/lib/stdlib/test/erl_lint_SUITE.erl
+++ b/lib/stdlib/test/erl_lint_SUITE.erl
@@ -2648,10 +2648,9 @@ otp_11872(Config) when is_list(Config) ->
             t() ->
                 1.
          ">>,
-    {error,[{6,erl_lint,{undefined_type,{product,0}}}],
-     [{8,erl_lint,{new_builtin_type,{map,0}}},
-      {8,erl_lint,
-       {deprecated_builtin_type,{dict,0},{dict,dict,2}, "OTP 18.0"}}]} =
+    {error,[{6,erl_lint,{undefined_type,{product,0}}},
+            {8,erl_lint,{undefined_type,{dict,0}}}],
+           [{8,erl_lint,{new_builtin_type,{map,0}}}]} =
         run_test2(Config, Ts, []),
     ok.
 
@@ -3334,8 +3333,8 @@ format_warn(Config) when is_list(Config) ->
     ok.
 
 format_level(Level, Count, Config) ->
-    ?line W = get_compilation_warnings(Config, "format",
-                                       [{warn_format, Level}]),
+    ?line W = get_compilation_result(Config, "format",
+                                     [{warn_format, Level}]),
     %% Pick out the 'format' warnings.
     ?line FW = lists:filter(fun({_Line, erl_lint, {format_error, _}}) -> true;
                                (_) -> false
@@ -3519,42 +3518,22 @@ bin_syntax_errors(Config) ->
     ok.
 
 predef(doc) ->
-    "OTP-10342: Predefined types: array(), digraph(), and so on";
+    "OTP-10342: No longer predefined types: array(), digraph(), and so on";
 predef(suite) -> [];
 predef(Config) when is_list(Config) ->
-    W = get_compilation_warnings(Config, "predef", []),
+    W = get_compilation_result(Config, "predef", []),
     [] = W,
-    W2 = get_compilation_warnings(Config, "predef2", []),
-    Tag = deprecated_builtin_type,
-    [{7,erl_lint,{Tag,{array,0},{array,array,1},"OTP 18.0"}},
-     {12,erl_lint,{Tag,{dict,0},{dict,dict,2},"OTP 18.0"}},
-     {17,erl_lint,{Tag,{digraph,0},{digraph,graph},"OTP 18.0"}},
-     {27,erl_lint,{Tag,{gb_set,0},{gb_sets,set,1},"OTP 18.0"}},
-     {32,erl_lint,{Tag,{gb_tree,0},{gb_trees,tree,2},"OTP 18.0"}},
-     {37,erl_lint,{Tag,{queue,0},{queue,queue,1},"OTP 18.0"}},
-     {42,erl_lint,{Tag,{set,0},{sets,set,1},"OTP 18.0"}},
-     {47,erl_lint,{Tag,{tid,0},{ets,tid},"OTP 18.0"}}] = W2,
-    Ts = [{otp_10342_1,
-           <<"-compile(nowarn_deprecated_type).
-
-              -spec t(dict()) -> non_neg_integer().
-
-              t(D) ->
-                  erlang:phash2(D, 3000).
-             ">>,
-           {[nowarn_unused_function]},
-           []},
-         {otp_10342_2,
-           <<"-spec t(dict()) -> non_neg_integer().
-
-              t(D) ->
-                  erlang:phash2(D, 3000).
-             ">>,
-           {[nowarn_unused_function]},
-           {warnings,[{1,erl_lint,
-                       {deprecated_builtin_type,{dict,0},{dict,dict,2},
-                        "OTP 18.0"}}]}}],
-    [] = run(Config, Ts),
+    %% dict(), digraph() and so on were removed in Erlang/OTP 18.0.
+    E2 = get_compilation_result(Config, "predef2", []),
+    Tag = undefined_type,
+    {[{7,erl_lint,{Tag,{array,0}}},
+      {12,erl_lint,{Tag,{dict,0}}},
+      {17,erl_lint,{Tag,{digraph,0}}},
+      {27,erl_lint,{Tag,{gb_set,0}}},
+      {32,erl_lint,{Tag,{gb_tree,0}}},
+      {37,erl_lint,{Tag,{queue,0}}},
+      {42,erl_lint,{Tag,{set,0}}},
+      {47,erl_lint,{Tag,{tid,0}}}],[]} = E2,
     ok.
 
 maps(Config) ->
@@ -3763,9 +3742,9 @@ run(Config, Tests) ->
         end,
     lists:foldl(F, [], Tests).
 
-%% Compiles a test file and returns the list of warnings.
+%% Compiles a test file and returns the list of warnings/errors.
 
-get_compilation_warnings(Conf, Filename, Warnings) ->
+get_compilation_result(Conf, Filename, Warnings) ->
     ?line DataDir = ?datadir,
     ?line File = filename:join(DataDir, Filename),
     {ok,Bin} = file:read_file(File++".erl"),
@@ -3774,6 +3753,7 @@ get_compilation_warnings(Conf, Filename, Warnings) ->
     Test = lists:nthtail(Start+Length, FileS),
     case run_test(Conf, Test, Warnings) of
         {warnings, Ws} -> Ws;
+        {errors,Es,Ws} -> {Es,Ws};
         [] -> []
     end.
 
diff --git a/lib/stdlib/test/erl_lint_SUITE_data/predef.erl b/lib/stdlib/test/erl_lint_SUITE_data/predef.erl
index ee9073aa67..3cb7bf40f1 100644
--- a/lib/stdlib/test/erl_lint_SUITE_data/predef.erl
+++ b/lib/stdlib/test/erl_lint_SUITE_data/predef.erl
@@ -5,8 +5,8 @@
 
 -export_type([array/0, digraph/0, gb_set/0]).
 
-%% Before Erlang/OTP 17.0 local re-definitions of pre-defined opaque
-%% types were ignored but did not generate any warning.
+%% Since Erlang/OTP 18.0 array() and so on are no longer pre-defined,
+%% so there is nothing special about them at all.
 -opaque array() :: atom().
 -opaque digraph() :: atom().
 -opaque gb_set() :: atom().