Merge branch 'nox/compiler/v3_core-case-arg-opt'

* nox/compiler/v3_core-case-arg-opt:
  Optimise case arguments in sys_core_fold
  Run sys_core_fold twice if any inliner is used

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl
index 5588f1fbe5..e79fe41f9b 100644
--- a/lib/compiler/src/compile.erl
+++ b/lib/compiler/src/compile.erl
@@ -626,7 +626,8 @@ core_passes() ->
 	{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},
+        {core_fold_after_inlining,fun test_any_inliner/1,
+         fun core_fold_module_after_inlining/1},
 	?pass(core_transforms)]},
        {iff,dcopt,{listing,"copt"}},
        {iff,'to_core',{done,"core"}}]}
@@ -1172,6 +1173,9 @@ test_core_inliner(#compile{options=Opts}) ->
 		end, Opts)
     end.
 
+test_any_inliner(St) ->
+    test_old_inliner(St) orelse test_core_inliner(St).
+
 core_old_inliner(#compile{code=Code0,options=Opts}=St) ->
     {ok,Code} = sys_core_inline:module(Code0, Opts),
     {ok,St#compile{code=Code}}.