From 398b7cb10fdf21c98514697d70f01e8ca7f1aad7 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Thu, 31 Mar 2016 08:58:44 +0200
Subject: Make assert macro implementations uniform

---
 lib/stdlib/include/assert.hrl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/include/assert.hrl b/lib/stdlib/include/assert.hrl
index 151794d114..74fdbf57aa 100644
--- a/lib/stdlib/include/assert.hrl
+++ b/lib/stdlib/include/assert.hrl
@@ -149,7 +149,8 @@
 -else.
 -define(assertEqual(Expect, Expr),
         begin
-        ((fun (__X) ->
+        ((fun () ->
+            __X = (Expect),
             case (Expr) of
                 __X -> ok;
                 __V -> erlang:error({assertEqual,
@@ -159,7 +160,7 @@
                                       {expected, __X},
                                       {value, __V}]})
             end
-          end)(Expect))
+          end)())
         end).
 -endif.
 
@@ -169,7 +170,8 @@
 -else.
 -define(assertNotEqual(Unexpected, Expr),
         begin
-        ((fun (__X) ->
+        ((fun () ->
+            __X = (Unexpected),
             case (Expr) of
                 __X -> erlang:error({assertNotEqual,
                                      [{module, ?MODULE},
@@ -178,7 +180,7 @@
                                       {value, __X}]});
                 _ -> ok
             end
-          end)(Unexpected))
+          end)())
         end).
 -endif.
 
-- 
cgit v1.2.3


From e0e021b80033ddf04f805dbb451b0df2ec291cbd Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Wed, 30 Mar 2016 16:29:58 +0200
Subject: Avoid dialyzer warnings for unreachable code in asserts

Dialyzer would warn about uses of the ?assert(BoolExpr) macro in assert.hrl
if the argument was known to be boolean-only.
---
 lib/stdlib/include/assert.hrl | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/include/assert.hrl b/lib/stdlib/include/assert.hrl
index 74fdbf57aa..9e5d4eb598 100644
--- a/lib/stdlib/include/assert.hrl
+++ b/lib/stdlib/include/assert.hrl
@@ -59,19 +59,22 @@
 -define(assert(BoolExpr),ok).
 -else.
 %% The assert macro is written the way it is so as not to cause warnings
-%% for clauses that cannot match, even if the expression is a constant.
+%% for clauses that cannot match, even if the expression is a constant or
+%% is known to be boolean-only.
 -define(assert(BoolExpr),
         begin
         ((fun () ->
+            __T = is_process_alive(self()),  % cheap source of truth
             case (BoolExpr) of
-                true -> ok;
+                __T -> ok;
                 __V -> erlang:error({assert,
                                      [{module, ?MODULE},
                                       {line, ?LINE},
                                       {expression, (??BoolExpr)},
                                       {expected, true},
-                                      case __V of false -> {value, __V};
-                                          _ -> {not_boolean,__V}
+                                      case not __T of
+                                          __V -> {value, false};
+                                          _ -> {not_boolean, __V}
                                       end]})
             end
           end)())
@@ -85,15 +88,17 @@
 -define(assertNot(BoolExpr),
         begin
         ((fun () ->
+            __F = not is_process_alive(self()),
             case (BoolExpr) of
-                false -> ok;
+                __F -> ok;
                 __V -> erlang:error({assert,
                                      [{module, ?MODULE},
                                       {line, ?LINE},
                                       {expression, (??BoolExpr)},
                                       {expected, false},
-                                      case __V of true -> {value, __V};
-                                          _ -> {not_boolean,__V}
+                                      case not __F of
+                                          __V -> {value, true};
+                                          _ -> {not_boolean, __V}
                                       end]})
             end
           end)())
-- 
cgit v1.2.3


From 96c6513bb374c95a686027ed33c75704f94c244a Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Thu, 21 Apr 2016 13:03:23 +0200
Subject: eunit: Remove -dialyzer attributes

---
 lib/eunit/src/eunit_lib.erl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl
index 4dbe023257..9dbb4835f8 100644
--- a/lib/eunit/src/eunit_lib.erl
+++ b/lib/eunit/src/eunit_lib.erl
@@ -192,7 +192,6 @@ error_msg(Title, Fmt, Args) ->
     io_lib:fwrite("*** ~ts ***\n~ts\n\n", [Title, Msg]).
 
 -ifdef(TEST).
--dialyzer({no_match, format_exception_test_/0}).
 format_exception_test_() ->
     [?_assertMatch(
         "\nymmud:rorre"++_,
@@ -274,7 +273,6 @@ dlist_next([], Xs) ->
 
 
 -ifdef(TEST).
--dialyzer({no_match, dlist_test_/0}).
 dlist_test_() ->
     {"deep list traversal",
      [{"non-list term -> singleton list",
@@ -340,7 +338,6 @@ is_nonempty_string([]) -> false;
 is_nonempty_string(Cs) -> is_string(Cs).
 
 -ifdef(TEST).
--dialyzer({no_match, is_string_test_/0}).
 is_string_test_() ->
     {"is_string",
      [{"no non-lists", ?_assert(not is_string($A))},
@@ -402,7 +399,7 @@ uniq([X | Xs]) -> [X | uniq(Xs)];
 uniq([]) -> [].
 
 -ifdef(TEST).
--dialyzer({[no_match, no_fail_call, no_improper_lists], uniq_test_/0}).
+-dialyzer({[no_fail_call, no_improper_lists], uniq_test_/0}).
 uniq_test_() ->
     {"uniq",
      [?_assertError(function_clause, uniq(ok)),
@@ -581,7 +578,6 @@ trie_match([], _T) ->
 
 -ifdef(TEST).
 
--dialyzer({no_match, trie_test_/0}).
 trie_test_() ->
     [{"basic representation",
       [?_assert(trie_new() =:= gb_trees:empty()),
-- 
cgit v1.2.3