aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-03-14 11:53:19 +0100
committerBjörn Gustavsson <[email protected]>2014-03-14 11:53:19 +0100
commit264e1eed4c3c67b3772f9b616b144e117d351044 (patch)
treef2c9f3b7787da1bd064bd9d00aa9a0464e51d4e3 /lib/compiler/src
parent0c7cc3253811ab6a49346101ed29297a85d00327 (diff)
parentd1ecc2003b8807d9622b6c1a8fccfe50e5c60a42 (diff)
downloadotp-264e1eed4c3c67b3772f9b616b144e117d351044.tar.gz
otp-264e1eed4c3c67b3772f9b616b144e117d351044.tar.bz2
otp-264e1eed4c3c67b3772f9b616b144e117d351044.zip
Merge branch 'nox/compiler/v3_core-mismatched-apply'
* nox/compiler/v3_core-mismatched-apply: cerl_inline: Fix type error
Diffstat (limited to 'lib/compiler/src')
-rw-r--r--lib/compiler/src/cerl_inline.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/compiler/src/cerl_inline.erl b/lib/compiler/src/cerl_inline.erl
index bc9bdc67a4..fa1d34cc9b 100644
--- a/lib/compiler/src/cerl_inline.erl
+++ b/lib/compiler/src/cerl_inline.erl
@@ -42,7 +42,7 @@
bitstr_flags/1, binary_segments/1, update_c_alias/3,
update_c_apply/3, update_c_binary/2, update_c_bitstr/6,
update_c_call/4, update_c_case/3, update_c_catch/2,
- update_c_clause/4, c_fun/2, c_int/1, c_let/3,
+ update_c_clause/4, c_fun/2, c_int/1, c_let/3, ann_c_let/4,
update_c_let/4, update_c_letrec/3, update_c_module/5,
update_c_primop/3, update_c_receive/4, update_c_seq/3,
c_seq/2, update_c_try/6, c_tuple/1, update_c_values/2,
@@ -1034,7 +1034,8 @@ i_apply(E, Ctxt, Ren, Env, S) ->
E2 = case is_c_fname(E1) andalso length(Es) =/= fname_arity(E1) of
true ->
V = new_var(Env),
- update_c_let(E, [V], E1, update_c_apply(E, V, Es));
+ ann_c_let(get_ann(E), [V], E1,
+ update_c_apply(E, V, Es));
false ->
update_c_apply(E, E1, Es)
end,