diff options
author | Hans Bolinder <[email protected]> | 2017-09-18 08:34:04 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2017-09-18 08:34:04 +0200 |
commit | 3db1b77f9d4f8b16cbc8aee764c81453603795d4 (patch) | |
tree | 4a5c464986d2c5fcfeafd9a4b3019f5dd1af0ee3 /lib/hipe/test | |
parent | c84f6fa2dc7c7615e36a575571ee1a6e9cd586a4 (diff) | |
parent | 25ad8573ba9e0b225b48f35964afb2eb023ecca4 (diff) | |
download | otp-3db1b77f9d4f8b16cbc8aee764c81453603795d4.tar.gz otp-3db1b77f9d4f8b16cbc8aee764c81453603795d4.tar.bz2 otp-3db1b77f9d4f8b16cbc8aee764c81453603795d4.zip |
Merge branch 'maint'
* maint:
dialyzer: Adjust a test case
dialyzer: Modify handling of singleton map key types
Dialyzer: Rewrite one map type invariant
Dialyzer: Rewrite some of the docs of map types
Diffstat (limited to 'lib/hipe/test')
-rw-r--r-- | lib/hipe/test/opt_verify_SUITE.erl | 2 | ||||
-rw-r--r-- | lib/hipe/test/opt_verify_SUITE_data/call_elim_test_branches_opt_poss.erl | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/lib/hipe/test/opt_verify_SUITE.erl b/lib/hipe/test/opt_verify_SUITE.erl index 79bc2f1f73..24f43af275 100644 --- a/lib/hipe/test/opt_verify_SUITE.erl +++ b/lib/hipe/test/opt_verify_SUITE.erl @@ -44,7 +44,7 @@ call_elim(Config) -> Icode5 = call_elim_test_file(Config, F3, icode_call_elim), 0 = substring_count(binary:bin_to_list(Icode5), "is_key"), Icode6 = call_elim_test_file(Config, F3, no_icode_call_elim), - 3 = substring_count(binary:bin_to_list(Icode6), "is_key"), + 2 = substring_count(binary:bin_to_list(Icode6), "is_key"), ok. call_elim_test_file(Config, FileName, Option) -> diff --git a/lib/hipe/test/opt_verify_SUITE_data/call_elim_test_branches_opt_poss.erl b/lib/hipe/test/opt_verify_SUITE_data/call_elim_test_branches_opt_poss.erl index c8ddfa1e75..12875f41af 100644 --- a/lib/hipe/test/opt_verify_SUITE_data/call_elim_test_branches_opt_poss.erl +++ b/lib/hipe/test/opt_verify_SUITE_data/call_elim_test_branches_opt_poss.erl @@ -6,17 +6,11 @@ test(A) -> if A > 0 -> true = has_a_field(#{a=>true}), true = has_a_field(#{b=>1, a=>"2"}), - true = has_a_field(#{a=>5, c=>4}), - true = has_tuple_field(#{{ab, 1}=><<"qq">>, 1 =>0}), - true = has_tuple_field(#{up =>down, {ab, 1}=>[]}), - true = has_tuple_field(#{{ab, 1}=>42}); + true = has_a_field(#{a=>5, c=>4}); A =< 0 -> true = has_a_field(#{a=>q, 'A' =>nej}), true = has_a_field(#{a=>"hej", false=>true}), - true = has_a_field(#{a=>3}), - true = has_tuple_field(#{{ab, 1}=>q, 'A' =>nej}), - true = has_tuple_field(#{{ab, 1}=>"hej", false=>true}), - true = has_tuple_field(#{{ab, 1}=>3}) + true = has_a_field(#{a=>3}) end, true = has_nil_field(#{[] =>3, b =>"seven"}), true = has_nil_field(#{"seventeen"=>17, []=>nil}), |