[llvm-commits] [llvm-gcc-4.2] r80588 - in /llvm-gcc-4.2/trunk/gcc: c-decl.c cp/except.c except.c except.h libfuncs.h llvm-internal.h objc/objc-act.c

Daniel Dunbar daniel at zuster.org
Mon Aug 31 12:08:12 PDT 2009


Hi Jim,

This caused the llvm-gcc-i386-darwin9 bootstrap to start failing. The
failures are the same as are currently on llvm-gcc-powerpc-darwin9
(which are the same as I see when building a local
llvm-gcc-x86_64-darwin10 bootstrap).

Unfortunately the llvm-gcc-powerpc-darwin9 failures started while the
buildbot was restarting, so I don't know exactly what is going on. I
believe this is somehow related to the instcombine changes, so your
change may have just caused llvm-gcc-i386-darwin9 to start hitting
something it wasn't before.

At this point I don't know whats up with the llvm-gcc bootstrap builds
but I would like the to get resolved ASAP. Can you talk to Chris about
where he is at on this and maybe take a look?

 - Daniel

On Mon, Aug 31, 2009 at 9:11 AM, Jim Grosbach<grosbach at apple.com> wrote:
> Author: grosbach
> Date: Mon Aug 31 11:11:29 2009
> New Revision: 80588
>
> URL: http://llvm.org/viewvc/llvm-project?rev=80588&view=rev
> Log:
> Cleanup of cruft left over from front-end sjlj bits. No longer necessary with the EH handled in the back end.
>
> Modified:
>    llvm-gcc-4.2/trunk/gcc/c-decl.c
>    llvm-gcc-4.2/trunk/gcc/cp/except.c
>    llvm-gcc-4.2/trunk/gcc/except.c
>    llvm-gcc-4.2/trunk/gcc/except.h
>    llvm-gcc-4.2/trunk/gcc/libfuncs.h
>    llvm-gcc-4.2/trunk/gcc/llvm-internal.h
>    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
>
> Modified: llvm-gcc-4.2/trunk/gcc/c-decl.c
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-decl.c?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/c-decl.c (original)
> +++ llvm-gcc-4.2/trunk/gcc/c-decl.c Mon Aug 31 11:11:29 2009
> @@ -3586,10 +3586,6 @@
>     = llvm_init_one_libfunc (USING_SJLJ_EXCEPTIONS
>                              ? "__gcc_personality_sj0"
>                              : "__gcc_personality_v0");
> -  llvm_unwind_sjlj_register_libfunc
> -    = llvm_init_one_libfunc ("_Unwind_SjLj_Register");
> -  llvm_unwind_sjlj_unregister_libfunc
> -    = llvm_init_one_libfunc ("_Unwind_SjLj_Unregister");
>  #else
>   eh_personality_libfunc
>     = init_one_libfunc (USING_SJLJ_EXCEPTIONS
>
> Modified: llvm-gcc-4.2/trunk/gcc/cp/except.c
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/except.c?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/cp/except.c (original)
> +++ llvm-gcc-4.2/trunk/gcc/cp/except.c Mon Aug 31 11:11:29 2009
> @@ -97,10 +97,6 @@
>     = llvm_init_one_libfunc (USING_SJLJ_EXCEPTIONS
>                              ? "__gxx_personality_sj0"
>                              : "__gxx_personality_v0");
> -  llvm_unwind_sjlj_register_libfunc
> -    = llvm_init_one_libfunc ("_Unwind_SjLj_Register");
> -  llvm_unwind_sjlj_unregister_libfunc
> -    = llvm_init_one_libfunc ("_Unwind_SjLj_Unregister");
>  #else
>   eh_personality_libfunc = init_one_libfunc (USING_SJLJ_EXCEPTIONS
>                                             ? "__gxx_personality_sj0"
>
> Modified: llvm-gcc-4.2/trunk/gcc/except.c
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/except.c?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/except.c (original)
> +++ llvm-gcc-4.2/trunk/gcc/except.c Mon Aug 31 11:11:29 2009
> @@ -115,21 +115,12 @@
>   htab_t type_to_runtime_map;
>
>  /* Describe the SjLj_Function_Context structure.  */
> -#ifndef ENABLE_LLVM
>  static GTY(()) tree sjlj_fc_type_node;
>  static int sjlj_fc_call_site_ofs;
>  static int sjlj_fc_data_ofs;
>  static int sjlj_fc_personality_ofs;
>  static int sjlj_fc_lsda_ofs;
>  static int sjlj_fc_jbuf_ofs;
> -#else
> -tree sjlj_fc_type_node;
> -int sjlj_fc_call_site_ofs;
> -int sjlj_fc_data_ofs;
> -int sjlj_fc_personality_ofs;
> -int sjlj_fc_lsda_ofs;
> -int sjlj_fc_jbuf_ofs;
> -#endif
>
>  /* Describes one exception region.  */
>  struct eh_region GTY(())
> @@ -285,7 +276,7 @@
>  static hashval_t ehspec_filter_hash (const void *);
>  static int add_ttypes_entry (htab_t, tree);
>  static int add_ehspec_entry (htab_t, htab_t, tree);
> -/*static void assign_filter_values (void); */
> +static void assign_filter_values (void);
>  static void build_post_landing_pads (void);
>  static void connect_post_landing_pads (void);
>  static void dw2_build_landing_pads (void);
> @@ -1385,7 +1376,7 @@
>    we use lots of landing pads, and so every type or list can share
>    the same filter value, which saves table space.  */
>
> -/*static*/ void
> +static void
>  assign_filter_values (void)
>  {
>   int i;
>
> Modified: llvm-gcc-4.2/trunk/gcc/except.h
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/except.h?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/except.h (original)
> +++ llvm-gcc-4.2/trunk/gcc/except.h Mon Aug 31 11:11:29 2009
> @@ -57,7 +57,6 @@
>  /* After initial rtl generation, call back to finish generating
>    exception support code.  */
>  extern void finish_eh_generation (void);
> -extern void assign_filter_values (void);
>
>  extern void init_eh (void);
>  extern void init_eh_for_function (void);
> @@ -125,13 +124,6 @@
>  extern struct eh_region *get_eh_region (unsigned);
>  extern tree get_eh_type_list (struct eh_region *);
>  extern tree lookup_type_for_runtime (tree);
> -
> -extern GTY(()) tree sjlj_fc_type_node;
> -extern int sjlj_fc_call_site_ofs;
> -extern int sjlj_fc_data_ofs;
> -extern int sjlj_fc_personality_ofs;
> -extern int sjlj_fc_lsda_ofs;
> -extern int sjlj_fc_jbuf_ofs;
>  #endif
>  /* LLVM local end */
>
>
> Modified: llvm-gcc-4.2/trunk/gcc/libfuncs.h
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/libfuncs.h?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/libfuncs.h (original)
> +++ llvm-gcc-4.2/trunk/gcc/libfuncs.h Mon Aug 31 11:11:29 2009
> @@ -82,15 +82,9 @@
>  #ifdef ENABLE_LLVM
>  #define llvm_unwind_resume_libfunc     (llvm_libfunc_table[LTI_unwind_resume])
>  #define llvm_eh_personality_libfunc    (llvm_libfunc_table[LTI_eh_personality])
> -#define llvm_unwind_sjlj_register_libfunc \
> -  (llvm_libfunc_table[LTI_unwind_sjlj_register])
> -#define llvm_unwind_sjlj_unregister_libfunc \
> -  (llvm_libfunc_table[LTI_unwind_sjlj_unregister])
>  #else
>  #define llvm_unwind_resume_libfunc     unwind_resume_libfunc
>  #define llvm_eh_personality_libfunc    eh_personality_libfunc
> -#define llvm_unwind_sjlj_register_libfunc unwind_sjlj_register_libfunc
> -#define llvm_unwind_sjlj_unregister_libfunc unwind_sjlj_unregister_libfunc
>  #endif
>  /* LLVM LOCAL end */
>
>
> Modified: llvm-gcc-4.2/trunk/gcc/llvm-internal.h
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-internal.h?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/llvm-internal.h (original)
> +++ llvm-gcc-4.2/trunk/gcc/llvm-internal.h Mon Aug 31 11:11:29 2009
> @@ -448,12 +448,6 @@
>   Value *EmitMemMove(Value *DestPtr, Value *SrcPtr, Value *Size, unsigned Align);
>   Value *EmitMemSet(Value *DestPtr, Value *SrcVal, Value *Size, unsigned Align);
>
> -  /// EmitSjLjDispatcher - Emit SJLJ EH dispatcher
> -  void EmitSjLjDispatcher();
> -
> -  /// EmitSjLjLandingPads - Emit SJLJ EH landing pads.
> -  void EmitSjLjLandingPads();
> -
>   /// EmitLandingPads - Emit EH landing pads.
>   void EmitLandingPads();
>
>
> Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=80588&r1=80587&r2=80588&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
> +++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Mon Aug 31 11:11:29 2009
> @@ -8291,10 +8291,6 @@
>  #ifdef ENABLE_LLVM
>       llvm_eh_personality_libfunc
>         = llvm_init_one_libfunc ("__objc_personality_v0");
> -      llvm_unwind_sjlj_register_libfunc
> -        = llvm_init_one_libfunc ("_Unwind_SjLj_Register");
> -      llvm_unwind_sjlj_unregister_libfunc
> -        = llvm_init_one_libfunc ("_Unwind_SjLj_Unregister");
>  #else
>       eh_personality_libfunc
>         = init_one_libfunc ("__objc_personality_v0");
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>




More information about the llvm-commits mailing list