diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-02-10 15:16:24 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-02-10 15:16:24 +0100 |
| commit | 993642bd638f194c2cbb0e62ee706e8d6eb81fce (patch) | |
| tree | 9a330707eb2dd75fc36c8f237cc59be8a3b44896 /lib/compiler/src | |
| parent | edb90b1c1e6dc290727a516f4a00e939479aff98 (diff) | |
| parent | 67663e057a35dfee45bf802539738b8ef107bd32 (diff) | |
| download | otp-993642bd638f194c2cbb0e62ee706e8d6eb81fce.tar.gz otp-993642bd638f194c2cbb0e62ee706e8d6eb81fce.tar.bz2 otp-993642bd638f194c2cbb0e62ee706e8d6eb81fce.zip | |
Merge branch 'egil/compiler/maps-fix-sys_core_fold'
* egil/compiler/maps-fix-sys_core_fold:
compiler: Fix sys_core_fold let optimization
compiler: Add debug listing after sys_core_fold
Diffstat (limited to 'lib/compiler/src')
| -rw-r--r-- | lib/compiler/src/compile.erl | 1 | ||||
| -rw-r--r-- | lib/compiler/src/core_lib.erl | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index 0bb4de6f17..5588f1fbe5 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -623,6 +623,7 @@ core_passes() -> [{core_old_inliner,fun test_old_inliner/1,fun core_old_inliner/1}, {iff,doldinline,{listing,"oldinline"}}, ?pass(core_fold_module), + {iff,dcorefold,{listing,"corefold"}}, {core_inline_module,fun test_core_inliner/1,fun core_inline_module/1}, {iff,dinline,{listing,"inline"}}, {core_fold_after_inlining,fun test_core_inliner/1,fun core_fold_module_after_inlining/1}, diff --git a/lib/compiler/src/core_lib.erl b/lib/compiler/src/core_lib.erl index f506901099..ed181e3baa 100644 --- a/lib/compiler/src/core_lib.erl +++ b/lib/compiler/src/core_lib.erl @@ -105,8 +105,8 @@ vu_expr(V, #c_cons{hd=H,tl=T}) -> vu_expr(V, H) orelse vu_expr(V, T); vu_expr(V, #c_tuple{es=Es}) -> vu_expr_list(V, Es); -vu_expr(V, #c_map{es=Es}) -> - vu_expr_list(V, Es); +vu_expr(V, #c_map{var=M,es=Es}) -> + vu_expr(V, M) orelse vu_expr_list(V, Es); vu_expr(V, #c_map_pair{key=Key,val=Val}) -> vu_expr_list(V, [Key,Val]); vu_expr(V, #c_binary{segments=Ss}) -> |