aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2018-01-04 15:48:10 +0100
committerBjörn Gustavsson <[email protected]>2018-01-10 11:37:33 +0100
commiteb5399aa43a9c5dac82f4d102e8dd8dd5b27a9f8 (patch)
tree84747d97dc2f1780ff35e4aab1f835b7b3ab5fa9 /lib/compiler
parent5da6b91ecab6c35f882496344dd13a6bf63b9230 (diff)
downloadotp-eb5399aa43a9c5dac82f4d102e8dd8dd5b27a9f8.tar.gz
otp-eb5399aa43a9c5dac82f4d102e8dd8dd5b27a9f8.tar.bz2
otp-eb5399aa43a9c5dac82f4d102e8dd8dd5b27a9f8.zip
Correct beam_utils:combine_heap_needs/2
In 21dd6e55877832, beam_utils:combine_heap_needs/2 stopped wrapping an allocation list in an {alloc,...} tuple. That was not noticed because the faulty heap need created in beam_block was discarded by beam_type.
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/src/beam_utils.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/src/beam_utils.erl b/lib/compiler/src/beam_utils.erl
index ebb885815f..a2795e625f 100644
--- a/lib/compiler/src/beam_utils.erl
+++ b/lib/compiler/src/beam_utils.erl
@@ -312,7 +312,7 @@ delete_live_annos([]) -> [].
combine_heap_needs(H1, H2) when is_integer(H1), is_integer(H2) ->
H1 + H2;
combine_heap_needs(H1, H2) ->
- combine_alloc_lists([H1,H2]).
+ {alloc,combine_alloc_lists([H1,H2])}.
%% anno_defs(Instructions) -> Instructions'