This change lifts a restriction whereby calls to subprograms without a previous
spec declared in the same unit weren't subject to inter-unit inlining. The
restriction is useless now thanks to the unit-at-a-time mode of the back-end.
Tested on i586-suse-linux, applied on the mainline.
2011-03-26 Eric Botcazou <ebotca...@adacore.com>
* inline.adb (Back_End_Cannot_Inline): Lift restriction on calls to
subprograms without a previous spec declared in the same unit.
* gcc-interface/trans.c (Compilation_Unit_to_gnu): Process inlined
subprograms at the end of the unit instead of at the beginning.
* gcc-interface/utils.c (create_subprog_decl): Check that the entity
isn't public for the special handling of non-inline functions nested
inside inline external functions.
2011-03-26 Eric Botcazou <ebotca...@adacore.com>
* gnat.dg/opt15.adb: New test.
* gnat.dg/opt15_pkg.ad[sb]: New helper.
--
Eric Botcazou
Index: inline.adb
===================================================================
--- inline.adb (revision 171404)
+++ inline.adb (working copy)
@@ -368,12 +368,6 @@ package body Inline is
-- inlined under ZCX because the numeric suffix generated by gigi
-- will be different in the body and the place of the inlined call.
--
- -- If the body to be inlined contains calls to subprograms declared
- -- in the same body that have no previous spec, the back-end cannot
- -- inline either because the bodies to be inlined are processed before
- -- the rest of the enclosing package body, and gigi will then find
- -- references to entities that have not been elaborated yet.
- --
-- This procedure must be carefully coordinated with the back end.
----------------------------
@@ -384,41 +378,6 @@ package body Inline is
Decl : constant Node_Id := Unit_Declaration_Node (Subp);
Body_Ent : Entity_Id;
Ent : Entity_Id;
- Bad_Call : Node_Id;
-
- function Process (N : Node_Id) return Traverse_Result;
- -- Look for calls to subprograms with no previous spec, declared
- -- in the same enclosing package body.
-
- -------------
- -- Process --
- -------------
-
- function Process (N : Node_Id) return Traverse_Result is
- begin
- if Nkind (N) = N_Procedure_Call_Statement
- or else Nkind (N) = N_Function_Call
- then
- if Is_Entity_Name (Name (N))
- and then Comes_From_Source (Entity (Name (N)))
- and then
- Nkind (Unit_Declaration_Node (Entity (Name (N))))
- = N_Subprogram_Body
- and then In_Same_Extended_Unit (Subp, Entity (Name (N)))
- then
- Bad_Call := N;
- return Abandon;
- else
- return OK;
- end if;
- else
- return OK;
- end if;
- end Process;
-
- function Has_Exposed_Call is new Traverse_Func (Process);
-
- -- Start of processing for Back_End_Cannot_Inline
begin
if Nkind (Decl) = N_Subprogram_Declaration
@@ -454,19 +413,7 @@ package body Inline is
Next_Entity (Ent);
end loop;
- if Has_Exposed_Call
- (Unit_Declaration_Node (Corresponding_Body (Decl))) = Abandon
- then
- if Ineffective_Inline_Warnings then
- Error_Msg_N
- ("?call to subprogram with no separate spec"
- & " prevents inlining!!", Bad_Call);
- end if;
-
- return True;
- else
- return False;
- end if;
+ return False;
end Back_End_Cannot_Inline;
-- Start of processing for Add_Inlined_Subprogram
Index: gcc-interface/utils.c
===================================================================
--- gcc-interface/utils.c (revision 171404)
+++ gcc-interface/utils.c (working copy)
@@ -1790,6 +1790,7 @@ create_subprog_decl (tree subprog_name,
We could inline the nested function as well but it's probably better
to err on the side of too little inlining. */
if (!inline_flag
+ && !public_flag
&& current_function_decl
&& DECL_DECLARED_INLINE_P (current_function_decl)
&& DECL_EXTERNAL (current_function_decl))
Index: gcc-interface/trans.c
===================================================================
--- gcc-interface/trans.c (revision 171404)
+++ gcc-interface/trans.c (working copy)
@@ -3793,6 +3793,20 @@ Compilation_Unit_to_gnu (Node_Id gnat_no
finalize_from_with_types ();
}
+ if (type_annotate_only && gnat_node == Cunit (Main_Unit))
+ {
+ elaborate_all_entities (gnat_node);
+
+ if (Nkind (Unit (gnat_node)) == N_Subprogram_Declaration
+ || Nkind (Unit (gnat_node)) == N_Generic_Package_Declaration
+ || Nkind (Unit (gnat_node)) == N_Generic_Subprogram_Declaration)
+ return;
+ }
+
+ process_decls (Declarations (Aux_Decls_Node (gnat_node)), Empty, Empty,
+ true, true);
+ add_stmt (gnat_to_gnu (Unit (gnat_node)));
+
/* If we can inline, generate code for all the inlined subprograms. */
if (optimize)
{
@@ -3822,20 +3836,6 @@ Compilation_Unit_to_gnu (Node_Id gnat_no
}
}
- if (type_annotate_only && gnat_node == Cunit (Main_Unit))
- {
- elaborate_all_entities (gnat_node);
-
- if (Nkind (Unit (gnat_node)) == N_Subprogram_Declaration
- || Nkind (Unit (gnat_node)) == N_Generic_Package_Declaration
- || Nkind (Unit (gnat_node)) == N_Generic_Subprogram_Declaration)
- return;
- }
-
- process_decls (Declarations (Aux_Decls_Node (gnat_node)), Empty, Empty,
- true, true);
- add_stmt (gnat_to_gnu (Unit (gnat_node)));
-
/* Process any pragmas and actions following the unit. */
add_stmt_list (Pragmas_After (Aux_Decls_Node (gnat_node)));
add_stmt_list (Actions (Aux_Decls_Node (gnat_node)));
package body Opt15_Pkg is
procedure Trace_Non_Inlined is
begin
raise Program_Error;
end;
procedure Trace_Inlined is
begin
Trace_Non_Inlined;
end;
end Opt15_Pkg;
-- { dg-do compile }
-- { dg-options "-O -gnatn -fdump-tree-optimized" }
with Opt15_Pkg; use Opt15_Pkg;
procedure Opt15 is
begin
Trace_Inlined;
end;
-- { dg-final { scan-tree-dump-not "trace_inlined" "optimized" } }
-- { dg-final { cleanup-tree-dump "optimized" } }
package Opt15_Pkg is
procedure Trace_Inlined;
pragma Inline (Trace_Inlined);
end Opt15_Pkg;
