File 0169-dialyzer-Do-not-expose-line-number-0-in-me... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0169-dialyzer-Do-not-expose-line-number-0-in-message-loca.patch of Package erlang (Revision 937f847f2956692f80dfc36d9f9dc085)

Currently displaying revision 937f847f2956692f80dfc36d9f9dc085 , Show latest

From 18fa73579d261b37b543e018f8d39cc2ad3e02e6 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Wed, 26 May 2021 13:08:20 +0200
Subject: [PATCH] dialyzer: Do not expose line number 0 in message locations

See also GH-4890: https://github.com/erlang/otp/pull/4890.

Commit 04b905d assigned better start locations to messages, but also
sometimes let line number 0 slip through. This is now corrected.
---
 lib/dialyzer/src/dialyzer_dataflow.erl |  7 +-----
 lib/dialyzer/src/dialyzer_utils.erl    | 33 +++++++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/dialyzer/src/dialyzer_dataflow.erl b/lib/dialyzer/src/dialyzer_dataflow.erl
index f0ecd89a8b..2323889a51 100644
--- a/lib/dialyzer/src/dialyzer_dataflow.erl
+++ b/lib/dialyzer/src/dialyzer_dataflow.erl
@@ -3649,11 +3649,6 @@ add_work(New, {List, Rev, Set} = Work) ->
 %%%
 %%% ===========================================================================
 
-get_line([Line|_]) when is_integer(Line) -> Line;
-get_line([{Line, _Column} | _Tail]) when is_integer(Line) -> Line;
-get_line([_|Tail]) -> get_line(Tail);
-get_line([]) -> -1.
-
 get_location(Tree) ->
   dialyzer_utils:get_location(Tree, 1).
 
@@ -3669,7 +3664,7 @@ get_file([_|Tail], State) ->
   get_file(Tail, State).
 
 is_compiler_generated(Ann) ->
-  lists:member(compiler_generated, Ann) orelse (get_line(Ann) < 1).
+  dialyzer_utils:is_compiler_generated(Ann).
 
 is_literal_record(Tree) ->
   Ann = cerl:get_ann(Tree),
diff --git a/lib/dialyzer/src/dialyzer_utils.erl b/lib/dialyzer/src/dialyzer_utils.erl
index 32bc812adc..c4ac96c9dc 100644
--- a/lib/dialyzer/src/dialyzer_utils.erl
+++ b/lib/dialyzer/src/dialyzer_utils.erl
@@ -33,6 +33,7 @@
          get_fun_meta_info/3,
          is_suppressed_fun/2,
          is_suppressed_tag/3,
+         is_compiler_generated/1,
 	 pp_hook/0,
 	 process_record_remote_types/1,
          merge_types/2,
@@ -746,6 +747,16 @@ is_fa({FuncName, Arity})
   when is_atom(FuncName), is_integer(Arity), Arity >= 0 -> true;
 is_fa(_) -> false.
 
+-spec is_compiler_generated([term()]) -> boolean().
+
+is_compiler_generated(Ann) ->
+  lists:member(compiler_generated, Ann) orelse (get_line(Ann) < 1).
+
+get_line([Line|_]) when is_integer(Line) -> Line;
+get_line([{Line, _Column} | _Tail]) when is_integer(Line) -> Line;
+get_line([_|Tail]) -> get_line(Tail);
+get_line([]) -> -1.
+
 %%-------------------------------------------------------------------
 %% Author      : Per Gustafsson <pergu@it.uu.se>
 %% Description : Provides better printing of binaries.
@@ -999,24 +1010,18 @@ get_location(Tree, Default) ->
 
 get_all_locations(Tree) ->
   SubTrees = lists:append(cerl:subtrees(Tree)),
-  case maybe_get_location(cerl:get_ann(Tree)) of
-    no ->
-      [];
-    Location ->
-      [Location]
-  end
+  Ann = cerl:get_ann(Tree),
+  [get_location(Ann) || not is_compiler_generated(Ann)]
   ++
   lists:append([get_all_locations(T) || T <- SubTrees]).
 
-maybe_get_location([Line|_]) when is_integer(Line) ->
+get_location([Line|_]) when is_integer(Line) ->
   Line;
-maybe_get_location([{Line, Column}|_Tail]) when is_integer(Line),
-                                                is_integer(Column) ->
-  {Line, Column};
-maybe_get_location([_|Tail]) ->
-  maybe_get_location(Tail);
-maybe_get_location([]) ->
-  no.
+get_location([{Line, Column}=Loc|_Tail]) when is_integer(Line),
+                                              is_integer(Column) ->
+  Loc;
+get_location([_|Tail]) ->
+  get_location(Tail).
 
 %%------------------------------------------------------------------------------
 
-- 
2.26.2

Places

File 0169-dialyzer-Do-not-expose-line-number-0-in-message-loca.patch of Package erlang (Revision 937f847f2956692f80dfc36d9f9dc085)

Places