teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

erlang: twerk patch.

This commit is contained in:
Leah Neukirchen 2017-11-11 22:07:42 +01:00
parent 6c93e1fba5
commit f7f596dae5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
srcpkgs/erlang/patches/ERL-490.patch
View File

@ -18,8 +18,8 @@ https://bugs.erlang.org/browse/ERL-490
lib/compiler/test/bs_match_SUITE.erl | 38 ++++++++++++++++++++++++++++++++++--
2 files changed, 39 insertions(+), 5 deletions(-)
--- lib/compiler/src/beam_validator.erl
+++ lib/compiler/src/beam_validator.erl
--- otp_src_20.1/lib/compiler/src/beam_validator.erl
+++ otp_src_20.1/lib/compiler/src/beam_validator.erl
@@ -1430,13 +1430,13 @@ merge_types(bool, {atom,A}) ->
merge_bool(A);
merge_types({atom,A}, bool) ->
@ -37,9 +37,8 @@ https://bugs.erlang.org/browse/ERL-490
merge_types(T1, T2) when T1 =/= T2 ->
%% Too different. All we know is that the type is a 'term'.
term.
diff --git a/lib/compiler/test/bs_match_SUITE.erl b/lib/compiler/test/bs_match_SUITE.erl
--- lib/compiler/test/bs_match_SUITE.erl
+++ lib/compiler/test/bs_match_SUITE.erl
--- otp_src_20.1/lib/compiler/test/bs_match_SUITE.erl
+++ otp_src_20.1/lib/compiler/test/bs_match_SUITE.erl
@@ -39,7 +39,7 @@
match_string_opt/1,select_on_integer/1,
map_and_binary/1,unsafe_branch_caching/1,