Merge branch 'bg/compiler-inliner' into dev

* bg/compiler-inliner:
  pmod_SUITE: Again test inlining parameterized modules
  compiler tests: Cope with missing args in function_clause for native code
  compiler tests: Compile a few more modules with 'inline'
  Consistently rewrite an inlined function_clause exception to case_clause
  compiler tests: Test the 'inline' option better
  compiler: Suppress bs_context_to_binary/1 for a literal operand
  compiler: Fix binary matching bug in the inliner
  sys_core_inline: Don't generated multiple compiler_generated annos

OTP-8552 bg/compiler-inliner

Several problems in the inliner have been fixed.

1 files changed, 32 insertions, 10 deletions

diff --git a/lib/compiler/src/cerl_inline.erl b/lib/compiler/src/cerl_inline.erl
index 191efa3032..6d7eca0113 100644
--- a/lib/compiler/src/cerl_inline.erl
+++ b/lib/compiler/src/cerl_inline.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 %% Core Erlang inliner.
@@ -1429,17 +1429,26 @@ inline(E, #app{opnds = Opnds, ctxt = Ctxt, loc = L}, Ren, Env, S) ->
 	    {E, S};
        true ->
 	    %% Create local bindings for the parameters to their
-	    %% respective operand structures from the app-structure, and
-	    %% visit the body in the context saved in the structure.
+	    %% respective operand structures from the app-structure.
 	    {Rs, Ren1, Env1, S1} = bind_locals(Vs, Opnds, Ren, Env, S),
-	    {E1, S2} = i(fun_body(E), Ctxt, Ren1, Env1, S1),
+
+	    %% function_clause exceptions that have been inlined
+	    %% into another function (or even into the same function)
+	    %% will not work properly. The v3_kernel pass will
+	    %% take care of it, but we will need to help it by
+	    %% removing any function_name annotations on match_fail
+	    %% primops that we inline.
+	    E1 = kill_function_name_anns(fun_body(E)),
+
+	    %% Visit the body in the context saved in the structure.
+	    {E2, S2} = i(E1, Ctxt, Ren1, Env1, S1),
 
 	    %% Create necessary bindings and/or set flags.
-	    {E2, S3} = make_let_bindings(Rs, E1, S2),
+	    {E3, S3} = make_let_bindings(Rs, E2, S2),
 
 	    %% Lastly, flag the application as inlined, since the inlining
 	    %% attempt was not aborted before we reached this point.
-	    {E2, st__set_app_inlined(L, S3)}
+	    {E3, st__set_app_inlined(L, S3)}
     end.
 
 %% For the (possibly renamed) argument variables to an inlined call,
@@ -2370,6 +2379,19 @@ kill_id_anns([A | As]) ->
 kill_id_anns([]) ->
     [].
 
+kill_function_name_anns(Body) ->
+    F = fun(P) ->
+		case type(P) of
+		    primop ->
+			Ann = get_ann(P),
+			Ann1 = lists:keydelete(function_name, 1, Ann),
+			set_ann(P, Ann1);
+		    _ ->
+			P
+		end
+	end,
+    cerl_trees:map(F, Body).
+
 
 %% =====================================================================
 %% General utilities