Improve code coverage

Author: bjorng

lib/compiler/src/beam_ssa_type.erl

@@ -2749,8 +2749,6 @@ infer_integer_get_range(Arg, Ts) ->
     case concrete_type(Arg, Ts) of
         #t_integer{elements={_,_}=R} ->
             R;
-        #t_number{elements={Min,Max}=R}
-          when is_integer(Min), is_integer(Max) -> R;
         _ ->
             {'-inf','+inf'}
     end.

lib/compiler/src/beam_validator.erl

@@ -2374,8 +2374,6 @@ infer_integer_get_range(Arg, Vst) ->
     case get_term_type(Arg, Vst) of
         #t_integer{elements={_,_}=R} ->
             R;
-        #t_number{elements={Min,Max}=R}
-          when is_integer(Min), is_integer(Max) -> R;
         _ ->
             {'-inf','+inf'}
     end.

lib/compiler/test/guard_SUITE.erl

@@ -3446,6 +3446,16 @@ is_integer_3_guard(_Config) ->
     2 = is_integer_3_guard_5(id(2), id(0), id(9)),
     false = is_integer_3_guard_5(id(1024), id(0), id(9)),
 
+    false = is_integer_3_guard_6(id(0), id(1), id(-1)),
+    true = is_integer_3_guard_6(id(0), id(0), id(1)),
+
+    false = is_integer_3_guard_7(id(0), id(1), id(9)),
+    true = is_integer_3_guard_7(id(1), id(1), id(9)),
+
+    true = is_integer_3_guard_8(id(17), id(12), id(20)),
+    false = is_integer_3_guard_8(id(0), id(12), id(20)),
+    true = is_integer_3_guard_8(id(5), id(1), id(20)),
+
     ok.
 
 is_integer_3_guard_1(X, LB, UB) when is_integer(X, LB, UB) ->
@@ -3463,18 +3473,40 @@ is_integer_3_guard_3(X) when not is_integer(X, 1, 1024) ->
 is_integer_3_guard_3(X) ->
     not is_integer(X, 1, 1024).
 
-is_integer_3_guard_4(X, LB, UB) when 0 =< LB, UB < 10, is_integer(X, LB, UB) ->
-    is_integer_id(X);
+is_integer_3_guard_4(X, LB, UB) when 0 =< LB, UB < 10,
+                                     is_integer(X, LB, UB) ->
+    is_integer_3_guard_4_id(X);
 is_integer_3_guard_4(X, LB, UB) ->
     is_integer(X, LB, UB).
 
-is_integer_3_guard_5(X, LB, UB) when 0 =< LB,  is_integer(UB),
+is_integer_3_guard_4_id(I) -> I.
+
+is_integer_3_guard_5(X, LB, UB) when 0 =< LB, is_integer(UB),
                                      UB < 10, is_integer(X, LB, UB) ->
-    is_integer_id(X);
+    is_integer_3_guard_5_id(X);
 is_integer_3_guard_5(X, LB, UB) ->
     is_integer(X, LB, UB).
 
-is_integer_id(I) -> I.
+is_integer_3_guard_5_id(I) -> I.
+
+%% Test incorrect order of bounds.
+is_integer_3_guard_6(X, LB, UB) when 10 =< LB, UB < 0, is_integer(X, LB, UB) ->
+    is_integer(X, LB, UB);
+is_integer_3_guard_6(X, LB, UB) ->
+    is_integer(X, LB, UB).
+
+is_integer_3_guard_7(X, LB, UB) when is_number(UB), UB < 10, is_integer(X, LB, UB) ->
+    is_integer(X, LB, UB);
+is_integer_3_guard_7(X, LB, UB) ->
+    is_integer(X, LB, UB).
+
+is_integer_3_guard_8(X, LB, UB) when is_number(LB), LB > 10, is_integer(X, LB, UB) ->
+    is_integer_3_guard_8_id(X),
+    is_integer(X, LB, UB);
+is_integer_3_guard_8(X, LB, UB) ->
+    is_integer(X, LB, UB).
+
+is_integer_3_guard_8_id(I) -> I.
 
 %% Call this function to turn off constant propagation.
 id(I) -> I.