aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-06-29 14:30:27 +0200
committerErlang/OTP <[email protected]>2018-06-29 14:30:27 +0200
commit5e3e6747ac924b3d7956630de501316567a15cad (patch)
tree1a27eb69aa1d071b38bf61e6e17699d54f41d1cf /lib/compiler/src
parenta32b35f2cd9ea997ab36bd250aebdb0961b25d0a (diff)
parentd10fd4596270d7f8503dc46a0a7c229ad08795d2 (diff)
downloadotp-5e3e6747ac924b3d7956630de501316567a15cad.tar.gz
otp-5e3e6747ac924b3d7956630de501316567a15cad.tar.bz2
otp-5e3e6747ac924b3d7956630de501316567a15cad.zip
Merge branch 'bjorn/compiler/fix-beam_jump-crash/ERL-660/OTP-15166' into maint-21
* bjorn/compiler/fix-beam_jump-crash/ERL-660/OTP-15166: Eliminate a crash in the beam_jump pass
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/beam_utils.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index ff587c4982..3bb671f034 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -355,6 +355,9 @@ split_even(Rs) -> split_even(Rs, [], []).
%% exit BIF will raise an exception
%% used - Reg is used
+check_liveness({fr,_}, _, St) ->
+ %% Conservatively always consider the floating point register used.
+ {used,St};
check_liveness(R, [{block,Blk}|Is], St0) ->
case check_liveness_block(R, Blk, St0) of
{transparent,St1} ->