RFR: 8308396: Fix offset_of conversion warnings in runtime code [v2]

[Coleen Phillimore]

On Fri, 19 May 2023 04:55:30 GMT, Amit Kumar <amitkumar at openjdk.org> wrote:

>> Coleen Phillimore has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Fix s390
>
> src/hotspot/cpu/s390/sharedRuntime_s390.cpp line 2781:
> 
>> 2779:   assert(Immediate::is_uimm8(Deoptimization::Unpack_LIMIT), "Code not fit for larger immediates");
>> 2780:   assert(Immediate::is_uimm8(Deoptimization::Unpack_uncommon_trap), "Code not fit for larger immediates");
>> 2781:   const int unpack_kind_byte_offset = Deoptimization::UnrollBlock::unpack_kind_offset()
> 
> Suggestion:
> 
>   const int unpack_kind_byte_offset = in_bytes(Deoptimization::UnrollBlock::unpack_kind_offset())

Fixed.

> src/hotspot/cpu/s390/sharedRuntime_s390.cpp line 2784:
> 
>> 2782: #ifndef VM_LITTLE_ENDIAN
>> 2783:   + 3
>> 2784: #endif
> 
> This is breaking build for s390x. 
> 
> 
> /home/amit/jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp: In static member function 'static void SharedRuntime::generate_uncommon_trap_blob()':           
> /home/amit/jdk/src/hotspot/cpu/s390/sharedRuntime_s390.cpp:2783:3: error: no match for 'operator+' (operand types are 'ByteSize' and 'int')                 
>    const int unpack_kind_byte_offset = Deoptimization::UnrollBlock::unpack_kind_offset()                                                                    
>                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                                                                    
>  #ifndef VM_LITTLE_ENDIAN                                                                                                                                   
>  ~~~~~~~~~~~~~~~~~~~~~~~~                                                                                                                                   
>    + 3                                                                                                                                                      
>    ^~~                                                                                                                                                      
> In file included from /home/amit/jdk/src/hotspot/share/utilities/exceptions.hpp:31,                                                                         
>                  from /home/amit/jdk/src/hotspot/share/oops/metadata.hpp:28,                                                                                
>                  from /home/amit/jdk/src/hotspot/share/oops/oop.hpp:32,                                                                                     
>                  from /home/amit/jdk/src/hotspot/share/runtime/handles.hpp:29,
>                  from /home/amit/jdk/src/hotspot/share/code/oopRecorder.hpp:28,                                                                            
>                  from /home/amit/jdk/src/hotspot/share/asm/codeBuffer.hpp:28,
>                  from /home/amit/jdk/src/hotspot/share/asm/assembler.hpp:28,
>                  from /home/amit/jdk/src/hotspot/share/asm/macroAssembler.hpp:28,                                                                          
>                  from /home/amit/jdk/src/hotspot/sha...

I only built product so have now adjusted my cross builds to include debug for s390.   Thank you for testing s390!

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/14053#discussion_r1198871600
PR Review Comment: https://git.openjdk.org/jdk/pull/14053#discussion_r1198872670