[erlang-patches] Fix hibernate with HiPE

[Niclas Axelsson]

On 01/-10/-28163 08:59 PM, Paul Guyot wrote:
> Le 11 oct. 2010 à 14:55, Björn Gustavsson a écrit :
>
>    
>> There is a compilation warning:
>>
>> beam/bif.c: In function ‘hibernate_3’:
>> beam/bif.c:1105: warning: assignment makes integer from pointer without a cast
>>
>> It's the following line:
>>
>>        BIF_P->def_arg_reg[3] =IF_P->i;
>>      
> Thank you for your e-mail. I have fixed this warning by using a proper cast. Since such casts are normally found in macros defined in bif.h, I added a new macro for hibernate_3 (that just sets BIF_P->i and leaves arity untouched), so all TRAP-related code is in a single place. I believe this should ease halfword emulator work.
>
> The new (combined) commit is here:
> http://github.com/pguyot/otp/commit/aa60538c7f68b4c657d8ead45ffb4e44164f9561
> git fetch git://github.com/pguyot/otp.git fix-hibernate-with-hipe branch
>
> Also, I noticed in the "Currently in the 'pu' branch" page (http://erlang.github.com/otp/) that there is "1 line with whitespace errors.". While I guess what a line with whitespace errors could be, how can I figure out which line it is ?
>
> Paul
>    

Hi Paul,

The 'dev' branch was updated yesterday and there was a merge conflict 
between your branch and 'dev'.
Can you please update your branch and check if you can solve the conflict?

Regards,
Niclas Axelsson, Erlang/OTP