Patchwork [stmt.c] : 6 of 7 Fix of PR target/53912 bootstrap fails using default c++ mode in stage 2 and 3 for native x86_64-w64-mingw32

login
register
mail settings
Submitter Kai Tietz
Date Nov. 29, 2012, 12:12 p.m.
Message ID <CAEwic4aqpU5KQ7H_MsYB8WijQuA7k13UBVQOiwca9r1MuBN1JQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/202727/
State New
Headers show

Comments

Kai Tietz - Nov. 29, 2012, 12:12 p.m.
Hello,

this trivial patch fixes a bootstrap issue on LLP64 hosts.

ChangeLog

2012-11-29 Kai Tietz

	PR target/53912
	* stmt.c (compute_cases_per_edge): Cast from pointer via intptr_t.
	(expand_case): Likewise.

Tested for i686-w64-mingw32, x86_64-w64-mingw32, and
x86_64-unknown-gnu-linux. Ok for apply?

Regards,
Kai
Kai Tietz - Dec. 2, 2012, 9:13 a.m.
Ping

2012/11/29 Kai Tietz <ktietz70@googlemail.com>:
> Hello,
>
> this trivial patch fixes a bootstrap issue on LLP64 hosts.
>
> ChangeLog
>
> 2012-11-29 Kai Tietz
>
>         PR target/53912
>         * stmt.c (compute_cases_per_edge): Cast from pointer via intptr_t.
>         (expand_case): Likewise.
>
> Tested for i686-w64-mingw32, x86_64-w64-mingw32, and
> x86_64-unknown-gnu-linux. Ok for apply?
>
> Regards,
> Kai
>
> Index: stmt.c
> ===================================================================
> --- stmt.c      (Revision 193925)
> +++ stmt.c      (Arbeitskopie)
> @@ -2061,7 +2061,7 @@ compute_cases_per_edge (gimple stmt)
>        tree lab = CASE_LABEL (elt);
>        basic_block case_bb = label_to_block_fn (cfun, lab);
>        edge case_edge = find_edge (bb, case_bb);
> -      case_edge->aux = (void *)((long)(case_edge->aux) + 1);
> +      case_edge->aux = (void *)((intptr_t)(case_edge->aux) + 1);
>      }
>  }
>
> @@ -2176,7 +2176,7 @@ expand_case (gimple stmt)
>        edge case_edge = find_edge (bb, case_bb);
>        case_list = add_case_node (
>            case_list, low, high, lab,
> -          case_edge->probability / (long)(case_edge->aux),
> +          case_edge->probability / (intptr_t)(case_edge->aux),
>            case_node_pool);
>      }
>    pointer_set_destroy (seen_labels);
NightStrike - Dec. 9, 2012, 3:58 p.m.
On Sat, Dec 1, 2012 at 11:13 PM, Kai Tietz <ktietz70@googlemail.com> wrote:
> Ping
>
> 2012/11/29 Kai Tietz <ktietz70@googlemail.com>:
>> Hello,
>>
>> this trivial patch fixes a bootstrap issue on LLP64 hosts.
>>
>> ChangeLog
>>
>> 2012-11-29 Kai Tietz
>>
>>         PR target/53912
>>         * stmt.c (compute_cases_per_edge): Cast from pointer via intptr_t.
>>         (expand_case): Likewise.
>>
>> Tested for i686-w64-mingw32, x86_64-w64-mingw32, and
>> x86_64-unknown-gnu-linux. Ok for apply?
>>
>> Regards,
>> Kai
>>
>> Index: stmt.c
>> ===================================================================
>> --- stmt.c      (Revision 193925)
>> +++ stmt.c      (Arbeitskopie)
>> @@ -2061,7 +2061,7 @@ compute_cases_per_edge (gimple stmt)
>>        tree lab = CASE_LABEL (elt);
>>        basic_block case_bb = label_to_block_fn (cfun, lab);
>>        edge case_edge = find_edge (bb, case_bb);
>> -      case_edge->aux = (void *)((long)(case_edge->aux) + 1);
>> +      case_edge->aux = (void *)((intptr_t)(case_edge->aux) + 1);
>>      }
>>  }
>>
>> @@ -2176,7 +2176,7 @@ expand_case (gimple stmt)
>>        edge case_edge = find_edge (bb, case_bb);
>>        case_list = add_case_node (
>>            case_list, low, high, lab,
>> -          case_edge->probability / (long)(case_edge->aux),
>> +          case_edge->probability / (intptr_t)(case_edge->aux),
>>            case_node_pool);
>>      }
>>    pointer_set_destroy (seen_labels);

Ping x2
Richard Guenther - Dec. 10, 2012, 9:20 a.m.
On Sun, Dec 9, 2012 at 4:58 PM, NightStrike <nightstrike@gmail.com> wrote:
> On Sat, Dec 1, 2012 at 11:13 PM, Kai Tietz <ktietz70@googlemail.com> wrote:
>> Ping
>>
>> 2012/11/29 Kai Tietz <ktietz70@googlemail.com>:
>>> Hello,
>>>
>>> this trivial patch fixes a bootstrap issue on LLP64 hosts.
>>>
>>> ChangeLog
>>>
>>> 2012-11-29 Kai Tietz
>>>
>>>         PR target/53912
>>>         * stmt.c (compute_cases_per_edge): Cast from pointer via intptr_t.
>>>         (expand_case): Likewise.
>>>
>>> Tested for i686-w64-mingw32, x86_64-w64-mingw32, and
>>> x86_64-unknown-gnu-linux. Ok for apply?
>>>
>>> Regards,
>>> Kai
>>>
>>> Index: stmt.c
>>> ===================================================================
>>> --- stmt.c      (Revision 193925)
>>> +++ stmt.c      (Arbeitskopie)
>>> @@ -2061,7 +2061,7 @@ compute_cases_per_edge (gimple stmt)
>>>        tree lab = CASE_LABEL (elt);
>>>        basic_block case_bb = label_to_block_fn (cfun, lab);
>>>        edge case_edge = find_edge (bb, case_bb);
>>> -      case_edge->aux = (void *)((long)(case_edge->aux) + 1);
>>> +      case_edge->aux = (void *)((intptr_t)(case_edge->aux) + 1);
>>>      }
>>>  }
>>>
>>> @@ -2176,7 +2176,7 @@ expand_case (gimple stmt)
>>>        edge case_edge = find_edge (bb, case_bb);
>>>        case_list = add_case_node (
>>>            case_list, low, high, lab,
>>> -          case_edge->probability / (long)(case_edge->aux),
>>> +          case_edge->probability / (intptr_t)(case_edge->aux),
>>>            case_node_pool);
>>>      }
>>>    pointer_set_destroy (seen_labels);
>
> Ping x2

Ok.

Thanks,
Richard.

Patch

Index: stmt.c
===================================================================
--- stmt.c      (Revision 193925)
+++ stmt.c      (Arbeitskopie)
@@ -2061,7 +2061,7 @@  compute_cases_per_edge (gimple stmt)
       tree lab = CASE_LABEL (elt);
       basic_block case_bb = label_to_block_fn (cfun, lab);
       edge case_edge = find_edge (bb, case_bb);
-      case_edge->aux = (void *)((long)(case_edge->aux) + 1);
+      case_edge->aux = (void *)((intptr_t)(case_edge->aux) + 1);
     }
 }

@@ -2176,7 +2176,7 @@  expand_case (gimple stmt)
       edge case_edge = find_edge (bb, case_bb);
       case_list = add_case_node (
           case_list, low, high, lab,
-          case_edge->probability / (long)(case_edge->aux),
+          case_edge->probability / (intptr_t)(case_edge->aux),
           case_node_pool);
     }
   pointer_set_destroy (seen_labels);