diff options
| author | Erlang/OTP <[email protected]> | 2017-10-02 15:55:09 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-10-02 15:55:09 +0200 |
| commit | 8a62e04d1283c450ad1fc440b57b87afca9f01d6 (patch) | |
| tree | 4f8a520d17c233bbaad8c1602d93689f1f9267e2 /lib/compiler/src | |
| parent | f28ff5122f81c4104af14b1717b4bb9a49f537b8 (diff) | |
| parent | 7715f437ab9a789e0500873b6002a49bfe69009c (diff) | |
| download | otp-8a62e04d1283c450ad1fc440b57b87afca9f01d6.tar.gz otp-8a62e04d1283c450ad1fc440b57b87afca9f01d6.tar.bz2 otp-8a62e04d1283c450ad1fc440b57b87afca9f01d6.zip | |
Merge branch 'bjorn/erts/match-context/ERL-490/OTP-14640' into maint-20
* bjorn/erts/match-context/ERL-490/OTP-14640:
Fix incorrect internal consistency failure for binary matching code
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/beam_validator.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl index 00901077d3..be8908dd6b 100644 --- a/lib/compiler/src/beam_validator.erl +++ b/lib/compiler/src/beam_validator.erl @@ -1430,13 +1430,13 @@ merge_types(bool, {atom,A}) -> merge_bool(A); merge_types({atom,A}, bool) -> merge_bool(A); -merge_types(#ms{id=Id1,valid=B0,slots=Slots}, - #ms{id=Id2,valid=B1,slots=Slots}) -> +merge_types(#ms{id=Id1,valid=B1,slots=Slots1}, + #ms{id=Id2,valid=B2,slots=Slots2}) -> Id = if Id1 =:= Id2 -> Id1; true -> make_ref() end, - #ms{id=Id,valid=B0 band B1,slots=Slots}; + #ms{id=Id,valid=B1 band B2,slots=min(Slots1, Slots2)}; merge_types(T1, T2) when T1 =/= T2 -> %% Too different. All we know is that the type is a 'term'. term. |