aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-12-05 14:52:39 +0100
committerBjörn Gustavsson <[email protected]>2018-12-05 14:52:39 +0100
commit66a3c14bf570e09cbe98cdaa10ee1873def71084 (patch)
treeb27f90aedf2ee1aeaedcd448fcfb892ebc17aa0a /lib
parent70ba4ed97a28fc7466d00c0a277ad5a0c0913fbb (diff)
parentc31902c4bb2d1a8e4ba4a8691581a22ea2daec43 (diff)
downloadotp-66a3c14bf570e09cbe98cdaa10ee1873def71084.tar.gz
otp-66a3c14bf570e09cbe98cdaa10ee1873def71084.tar.bz2
otp-66a3c14bf570e09cbe98cdaa10ee1873def71084.zip
Merge branch 'bjorn/compiler/fragility'
* bjorn/compiler/fragility: beam_validator: Don't discard fragility
Diffstat (limited to 'lib')
-rw-r--r--lib/compiler/src/beam_validator.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/compiler/src/beam_validator.erl b/lib/compiler/src/beam_validator.erl
index 7d908df3bf..1945faba7f 100644
--- a/lib/compiler/src/beam_validator.erl
+++ b/lib/compiler/src/beam_validator.erl
@@ -1366,8 +1366,10 @@ kill_aliases(Reg, #st{aliases=Aliases0}=St) ->
St
end.
-set_type(Type, {x,_}=Reg, Vst) -> set_type_reg(Type, Reg, Vst);
-set_type(Type, {y,_}=Reg, Vst) -> set_type_y(Type, Reg, Vst);
+set_type(Type, {x,_}=Reg, Vst) ->
+ set_type_reg(Type, Reg, Reg, Vst);
+set_type(Type, {y,_}=Reg, Vst) ->
+ set_type_reg(Type, Reg, Reg, Vst);
set_type(_, _, #vst{}=Vst) -> Vst.
set_type_reg(Type, Src, Dst, Vst) ->