Message ID | e3aeafdecc4829ffe0fa75058788122a809fc6df.camel@mengyan1223.wang |
---|---|
State | New |
Headers | show |
Series | libgcc: fix a warning calling find_fde_tail | expand |
On Fri, Feb 25, 2022 at 02:35:07AM +0800, Xi Ruoyao via Gcc-patches wrote: > Bootstrapped on x86_64-linux-gnu. OK for master? > > The third parameter of find_fde_tail is an _Unwind_Ptr (which is an > integer type instead of a pointer), but we are passing NULL to it. This > causes a -Wint-conversion warning. > > libgcc/ > > * unwind-dw2-fde-dip.c (_Unwind_Find_FDE): Call find_fde_tail > with 0 instead of NULL. Ok (except that the second ChangeLog entry line should be indented just with a tab, not any spaces after the tab). > --- a/libgcc/unwind-dw2-fde-dip.c > +++ b/libgcc/unwind-dw2-fde-dip.c > @@ -514,7 +514,7 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases > *bases) > # if DLFO_STRUCT_HAS_EH_DBASE > (_Unwind_Ptr) dlfo.dlfo_eh_dbase, > # else > - NULL, > + 0, > # endif > bases); > else > -- > 2.35.1 > Jakub
On Thu, 2022-02-24 at 19:53 +0100, Jakub Jelinek wrote: > On Fri, Feb 25, 2022 at 02:35:07AM +0800, Xi Ruoyao via Gcc-patches > wrote: > > Bootstrapped on x86_64-linux-gnu. OK for master? > > > > The third parameter of find_fde_tail is an _Unwind_Ptr (which is an > > integer type instead of a pointer), but we are passing NULL to it. > > This > > causes a -Wint-conversion warning. > > > > libgcc/ > > > > * unwind-dw2-fde-dip.c (_Unwind_Find_FDE): Call > > find_fde_tail > > with 0 instead of NULL. > > Ok (except that the second ChangeLog entry line should be indented > just > with a tab, not any spaces after the tab). Pushed as r12-7375, with the ChangeLog corrected.
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c index 3d6f39f5460..7f9be5e6b02 100644 --- a/libgcc/unwind-dw2-fde-dip.c +++ b/libgcc/unwind-dw2-fde-dip.c @@ -514,7 +514,7 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases) # if DLFO_STRUCT_HAS_EH_DBASE (_Unwind_Ptr) dlfo.dlfo_eh_dbase, # else - NULL, + 0, # endif bases);