diff options
author | John Högberg <[email protected]> | 2019-05-28 11:36:33 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2019-05-28 11:36:33 +0200 |
commit | 840d77f10ed5897a1eb69e179dbdca5e47deb152 (patch) | |
tree | f365a1b47e88e4bbf755f6b555945396ec7fd95e /lib/compiler/src/beam_ssa_type.erl | |
parent | 4953ee5e5f02adba1bd511a8f628f198d14676e7 (diff) | |
parent | 0e72e780498e47614de5730c8d4453948c9ad1da (diff) | |
download | otp-840d77f10ed5897a1eb69e179dbdca5e47deb152.tar.gz otp-840d77f10ed5897a1eb69e179dbdca5e47deb152.tar.bz2 otp-840d77f10ed5897a1eb69e179dbdca5e47deb152.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/compiler/src/beam_ssa_type.erl')
-rw-r--r-- | lib/compiler/src/beam_ssa_type.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/compiler/src/beam_ssa_type.erl b/lib/compiler/src/beam_ssa_type.erl index ca5b3d93a9..f1c0030b3c 100644 --- a/lib/compiler/src/beam_ssa_type.erl +++ b/lib/compiler/src/beam_ssa_type.erl @@ -990,11 +990,15 @@ type(call, [#b_remote{mod=#b_literal{val=Mod}, {_,_} -> #t_tuple{} end; - {erlang,'++',[List1,List2]} -> - case get_type(List1, Ts) =:= cons orelse - get_type(List2, Ts) =:= cons of - true -> cons; - false -> list + {erlang,'++',[LHS,RHS]} -> + LType = get_type(LHS, Ts), + RType = get_type(RHS, Ts), + case LType =:= cons orelse RType =:= cons of + true -> + cons; + false -> + %% `[] ++ RHS` yields RHS, even if RHS is not a list. + join(list, RType) end; {erlang,'--',[_,_]} -> list; |