[lto-streamer] Fix merge problems

Ollie Wild aaw@google.com
Tue Jun 10 20:03:00 GMT 2008


On Tue, Jun 10, 2008 at 11:32 AM, Diego Novillo <dnovillo@google.com> wrote:
>
> I had merged lto into lto-streamer in preparation for a merge in the
> opposite direction but I messed up the merge and undid a few changes
> that Bill had committed earlier (sorry Bill).
>
> Fixed with this patch:

I'm still seeing some discrepancies.  The following changes from
Kenny's r136488 seem to have gotten lost from the merge:

        * lto-cgraph.c: New file that is combination of lto-cgraph-out.c
        lto-cgraph-in.c and cgraph.h.
        * lto-cgraph.h: File deleted and all infomation moved to
        lto-cgraph.c.
        (output_type_ref_1): Renamed to lto_output_type_ref_index and
        moved to lto_section_out.c
        (output_type_ref, output_function): Now calls lto_output_type_ref_index.
        (output_expr_operand): Moved bodies of FIELD_DECL, FUNCTION_DECL,
        VAR_DECL, TYPE_DECL, NAMESPACE_DECL to new functions in
        lto_section_out.c.

Ollie



More information about the Gcc-patches mailing list