aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2019-01-16 12:47:54 +0100
committerBjörn Gustavsson <[email protected]>2019-01-16 12:47:54 +0100
commit401bd13ffd39052d4125fbc6fc8360dc08121883 (patch)
tree8f890a7f400f5a274b1bce6023171dac933a5eb8
parent735ae78289785076bca97c74cb22efe8a0120968 (diff)
parent5679396952f159eaf1c4f6e0cd48170f72ea24f6 (diff)
downloadotp-401bd13ffd39052d4125fbc6fc8360dc08121883.tar.gz
otp-401bd13ffd39052d4125fbc6fc8360dc08121883.tar.bz2
otp-401bd13ffd39052d4125fbc6fc8360dc08121883.zip
Merge branch 'maint'
* maint: beam_type: Eliminate compiler crash when arithmetic expression fails Conflicts: lib/compiler/src/beam_type.erl
-rw-r--r--lib/compiler/test/beam_type_SUITE.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/compiler/test/beam_type_SUITE.erl b/lib/compiler/test/beam_type_SUITE.erl
index 918e45ff6f..6efa98de44 100644
--- a/lib/compiler/test/beam_type_SUITE.erl
+++ b/lib/compiler/test/beam_type_SUITE.erl
@@ -213,6 +213,10 @@ coverage(Config) ->
[_|_] ->
ok
end,
+
+ %% Cover beam_type:verified_type(none).
+ {'EXIT',{badarith,_}} = (catch (id(2) / id(1)) band 16#ff),
+
ok.
booleans(_Config) ->