aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2019-01-18 11:27:25 +0100
committerBjörn Gustavsson <[email protected]>2019-01-18 11:27:25 +0100
commit2e66ca138d21e277ba0e005d56a88353013d0ddf (patch)
tree2b93307f1e149367010f078b8649808e5f500b35 /lib/compiler
parent1e62d4da9762dda158c01c8d684e4d8291ce0d48 (diff)
parent39a0f4254f759dbce35be7325e0362100baab3c5 (diff)
downloadotp-2e66ca138d21e277ba0e005d56a88353013d0ddf.tar.gz
otp-2e66ca138d21e277ba0e005d56a88353013d0ddf.tar.bz2
otp-2e66ca138d21e277ba0e005d56a88353013d0ddf.zip
Merge branch 'bjorn/compiler/fix-inlined-funs'
* bjorn/compiler/fix-inlined-funs: sys_core_inline: Kill *all* fun annotations when inlining
Diffstat (limited to 'lib/compiler')
-rw-r--r--lib/compiler/src/sys_core_inline.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/compiler/src/sys_core_inline.erl b/lib/compiler/src/sys_core_inline.erl
index 5a6cc45e4a..3380e3f1bd 100644
--- a/lib/compiler/src/sys_core_inline.erl
+++ b/lib/compiler/src/sys_core_inline.erl
@@ -195,6 +195,9 @@ kill_id_anns(Body) ->
cerl_trees:map(fun(#c_fun{anno=A0}=CFun) ->
A = kill_id_anns_1(A0),
CFun#c_fun{anno=A};
+ (#c_var{anno=A0}=Var) ->
+ A = kill_id_anns_1(A0),
+ Var#c_var{anno=A};
(Expr) ->
%% Mark everything as compiler generated to
%% suppress bogus warnings.