From 3dd15a193e4a5aea1dd100d6a4e5ad3401334dfe Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Tue, 11 Apr 2017 13:06:50 +0200
Subject: stdlib: Add checks of the dialyzer attribute to the linter

The same checks are also performed by the Dialyzer.
---
 lib/dialyzer/doc/src/dialyzer.xml     |  7 +------
 lib/dialyzer/src/dialyzer_options.erl |  3 +++
 lib/dialyzer/test/plt_SUITE.erl       | 37 ++++++++++++++++++++++++-----------
 3 files changed, 30 insertions(+), 17 deletions(-)

(limited to 'lib/dialyzer')

diff --git a/lib/dialyzer/doc/src/dialyzer.xml b/lib/dialyzer/doc/src/dialyzer.xml
index 4b7eb4ad68..e34ffd6def 100644
--- a/lib/dialyzer/doc/src/dialyzer.xml
+++ b/lib/dialyzer/doc/src/dialyzer.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2006</year><year>2016</year>
+      <year>2006</year><year>2017</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -456,11 +456,6 @@ dialyzer --plts plt_1 ... plt_n -- files_to_analyze</code>
       options are also enumerated, see function <seealso marker="#gui/1">
       <c>gui/1</c></seealso> below (<c>WarnOpts</c>).</p>
 
-    <note>
-      <p>Attribute <c>-dialyzer()</c> is not checked by the Erlang
-        compiler, but by Dialyzer itself.</p>
-    </note>
-
     <note>
       <p>Warning option <c>-Wrace_conditions</c> has no effect when
         set in source files.</p>
diff --git a/lib/dialyzer/src/dialyzer_options.erl b/lib/dialyzer/src/dialyzer_options.erl
index 616e8834f5..ec3f41311d 100644
--- a/lib/dialyzer/src/dialyzer_options.erl
+++ b/lib/dialyzer/src/dialyzer_options.erl
@@ -277,6 +277,9 @@ assert_solvers([Term|_]) ->
 
 -spec build_warnings([atom()], dial_warn_tags()) -> dial_warn_tags().
 
+%% The warning options are checked by the code linter.
+%% The function erl_lint:is_module_dialyzer_option/1 must
+%% be updated if options are added or removed.
 build_warnings([Opt|Opts], Warnings) ->
   NewWarnings =
     case Opt of
diff --git a/lib/dialyzer/test/plt_SUITE.erl b/lib/dialyzer/test/plt_SUITE.erl
index ba153c1c27..92c63bdb0c 100644
--- a/lib/dialyzer/test/plt_SUITE.erl
+++ b/lib/dialyzer/test/plt_SUITE.erl
@@ -259,26 +259,41 @@ remove_plt(Config) ->
                         {init_plt, Plt}] ++ Opts),
     ok.
 
+%% ERL-283, OTP-13979. As of OTP-14323 this test no longer does what
+%% it is designed to do--the linter stops every attempt to run the
+%% checks of Dialyzer's on bad dialyzer attributes. For the time
+%% being, the linter's error message are checked instead. The test
+%% needs to be updated when/if the Dialyzer can analyze Core Erlang
+%% without compiling abstract code.
 bad_dialyzer_attr(Config) ->
     PrivDir = ?config(priv_dir, Config),
-    Plt = filename:join(PrivDir, "plt_bad_dialyzer_attr.plt"),
+    Source = lists:concat([dial, ".erl"]),
+    Filename = filename:join(PrivDir, Source),
+    ok = dialyzer_common:check_plt(PrivDir),
+    PltFilename = dialyzer_common:plt_file(PrivDir),
+    Opts = [{files, [Filename]},
+            {check_plt, false},
+            {from, src_code},
+            {init_plt, PltFilename}],
+
     Prog1 = <<"-module(dial).
                -dialyzer({no_return, [undef/0]}).">>,
-    {ok, Beam1} = compile(Config, Prog1, dial, []),
+    ok = file:write_file(Filename, Prog1),
     {dialyzer_error,
-     "Analysis failed with error:\n"
-     "Could not scan the following file(s):\n"
-     "  Unknown function undef/0 in line " ++ _} =
-        (catch run_dialyzer(plt_build, [Beam1], [{output_plt, Plt}])),
+     "Analysis failed with error:\n" ++ Str1} =
+        (catch dialyzer:run(Opts)),
+    P1 = string:str(Str1, "dial.erl:2: function undef/0 undefined"),
+    true = P1 > 0,
 
     Prog2 = <<"-module(dial).
                -dialyzer({no_return, [{undef,1,2}]}).">>,
-    {ok, Beam2} = compile(Config, Prog2, dial, []),
+    ok = file:write_file(Filename, Prog2),
     {dialyzer_error,
-     "Analysis failed with error:\n"
-     "Could not scan the following file(s):\n"
-     "  Bad function {undef,1,2} in line " ++ _} =
-        (catch run_dialyzer(plt_build, [Beam2], [{output_plt, Plt}])),
+     "Analysis failed with error:\n" ++ Str2} =
+        (catch dialyzer:run(Opts)),
+    P2 = string:str(Str2, "dial.erl:2: badly formed dialyzer "
+                          "attribute: {no_return,{undef,1,2}}"),
+    true = P2 > 0,
 
     ok.
 
-- 
cgit v1.2.3