[Committed] Fix PR libobjc/30731 warnings due to read_uleb128/read_sleb128 changes

[Committed] Fix PR libobjc/30731 warnings due to read_uleb128/read_sleb128 changes

[Andrew Pinski]

[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]

Hi,
  After:
2007-01-24  Andreas Krebbel  <krebbel1@de.ibm.com>

        * unwind-dw2-fde.c (get_cie_encoding): Replaced _Unwind_Word with
        _uleb128_t and _Unwind_SWord with _sleb128_t.
        * unwind-dw2.c (extract_cie_info, execute_stack_op,
        execute_cfa_program, uw_frame_state_for, uw_update_context_1):
        Likewise.
        * unwind-c.c (parse_lsda_header, PERSONALITY_FUNCTION): Likewise.
        * unwind-pe.h (read_uleb128, read_sleb128,
        read_encoded_value_with_base): Likewise.
        * unwind-generic.h: Define _sleb128_t and _uleb128_t types.

buiding libobjc generates warnings due to _Unwind_Word not being
compatiable with  _uleb128_t/_sleb128_t.  This patch fixes the
warnings by using _uleb128_t/_sleb128_t.

Committed after a bootstrap/test on i386-apple-darwin8.10 with no regressions.

Thanks,
Andrew Pinski

ChangeLog:
* exception.c (parse_lsda_header): Use _uleb128_t/_sleb128_t instead
of _Unwind_Word for variables which are used in
read_uleb128/read_sleb128.
(PERSONALITY_FUNCTION): Likewise.

[-- Attachment #2: fixpr30731.diff.txt --]
[-- Type: text/plain, Size: 1260 bytes --]

Index: exception.c
===================================================================
--- exception.c	(revision 127241)
+++ exception.c	(working copy)
@@ -75,7 +75,7 @@ static const unsigned char *
 parse_lsda_header (struct _Unwind_Context *context, const unsigned char *p,
 		   struct lsda_header_info *info)
 {
-  _Unwind_Word tmp;
+  _uleb128_t tmp;
   unsigned char lpstart_encoding;
 
   info->Start = (context ? _Unwind_GetRegionStart (context) : 0);
@@ -205,7 +205,7 @@ PERSONALITY_FUNCTION (int version,
     return _URC_CONTINUE_UNWIND;
   else
     {
-      _Unwind_Word cs_lp, cs_action;
+      _uleb128_t cs_lp, cs_action;
       do
 	{
 	  p = read_uleb128 (p, &cs_lp);
@@ -225,7 +225,7 @@ PERSONALITY_FUNCTION (int version,
   while (p < info.action_table)
     {
       _Unwind_Ptr cs_start, cs_len, cs_lp;
-      _Unwind_Word cs_action;
+      _uleb128_t cs_action;
 
       /* Note that all call-site encodings are "absolute" displacements.  */
       p = read_encoded_value (0, info.call_site_encoding, p, &cs_start);
@@ -271,7 +271,7 @@ PERSONALITY_FUNCTION (int version,
   else
     {
       /* Otherwise we have a catch handler.  */
-      _Unwind_Sword ar_filter, ar_disp;
+      _sleb128_t ar_filter, ar_disp;
 
       while (1)
 	{

Re: [Committed] Fix PR libobjc/30731 warnings due to read_uleb128/read_sleb128 changes

[Andreas Krebbel]

> ChangeLog:
> * exception.c (parse_lsda_header): Use _uleb128_t/_sleb128_t instead
> of _Unwind_Word for variables which are used in
> read_uleb128/read_sleb128.
> (PERSONALITY_FUNCTION): Likewise.

Thanks for fixing this!

Bye,

-Andreas-