aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src/beam_block.erl
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-01-30 13:45:41 +0100
committerBjörn Gustavsson <[email protected]>2018-01-30 14:03:26 +0100
commitce51e9969798cef67b4d00e03a9e59c7986a8bdd (patch)
tree213c326a8c3b9507c6f91943ec43a03fd7a1f6c4 /lib/compiler/src/beam_block.erl
parentfc6eb93ae081ac5ebf715e53d0d2519067fcea95 (diff)
downloadotp-ce51e9969798cef67b4d00e03a9e59c7986a8bdd.tar.gz
otp-ce51e9969798cef67b4d00e03a9e59c7986a8bdd.tar.bz2
otp-ce51e9969798cef67b4d00e03a9e59c7986a8bdd.zip
Fix incorrect handling of floating point instructions
1a029efd1ad47f started to run the beam_block pass a second time. Since it is run after introduction of the optimized floating point instructions, it must handle those instructions correctly. In particular, it must be careful when hoisting allocation instructions. For example, the following code: {test_heap,{alloc,[{words,0},{floats,1}]},5}. . . . {fmove,{fr,2},{x,0}}. {allocate_zero,1,4}. must not be rewritten to: {test_heap,{alloc,[{words,0},{floats,1}]},5}. . . . {allocate_zero,1,4}. {fmove,{fr,2},{x,0}}. because beam_validator will not consider it safe. (The code may actually be safe depending on what the code between the two allocation instructions do.) https://bugs.erlang.org/browse/ERL-555
Diffstat (limited to 'lib/compiler/src/beam_block.erl')
-rw-r--r--lib/compiler/src/beam_block.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/compiler/src/beam_block.erl b/lib/compiler/src/beam_block.erl
index d0536e0669..ecefeeae54 100644
--- a/lib/compiler/src/beam_block.erl
+++ b/lib/compiler/src/beam_block.erl
@@ -222,6 +222,7 @@ move_allocates_1([I|Is], Acc) ->
move_allocates_1(Is, [I|Acc]);
move_allocates_1([], Acc) -> Acc.
+alloc_may_pass({set,_,[{fr,_}],fmove}) -> false;
alloc_may_pass({set,_,_,{alloc,_,_}}) -> false;
alloc_may_pass({set,_,_,{set_tuple_element,_}}) -> false;
alloc_may_pass({set,_,_,put_list}) -> false;