RFR: 8157907: Incorrect inclusion of atomic.hpp instead of atomic.inline.hpp
Per Liden
per.liden at oracle.com
Wed Aug 17 13:26:35 UTC 2016
Hi David,
On 2016-08-17 00:46, David Holmes wrote:
> Updated webrev:
>
> http://cr.openjdk.java.net/~dholmes/8157907/webrev.v2/
>
> Fixes incorrect include-guards for renamed header files.
> Updates copyrights.
Looks good.
cheers,
Per
>
> Thanks,
> David
>
> On 17/08/2016 1:35 PM, David Holmes wrote:
>> Hi Per,
>>
>> Thanks for the review!
>>
>> On 17/08/2016 12:57 PM, Per Liden wrote:
>>> Hi David,
>>>
>>> On 2016-08-16 03:01, David Holmes wrote:
>>>> Bug: https://bugs.openjdk.java.net/browse/JDK-8157907
>>>>
>>>> webrev: http://cr.openjdk.java.net/~dholmes/8157907/webrev/
>>>
>>> Thanks for cleaning this up. Looks good, just found one thing. All the
>>> atomic_xxx.inline.hpp files that were renamed also need to have their
>>> include guard macro name updated, e.g.
>>
>> Doh! Thanks for spotting that. Will fix.
>>
>> David
>>
>>> src/os_cpu/linux_x86/vm/atomic_linux_x86.hpp
>>>
>>> 25 #ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
>>> 26 #define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
>>> ....
>>> 228 #endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
>>>
>>> should now be
>>>
>>> 25 #ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
>>> 26 #define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
>>> ....
>>> 227 #endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
>>>
>>> cheers,
>>> Per
>>>
>>>>
>>>> Following on from the discussion here:
>>>>
>>>> http://mail.openjdk.java.net/pipermail/hotspot-dev/2016-August/024171.html
>>>>
>>>>
>>>>
>>>>
>>>> this is the formal RFR for these changes.
>>>>
>>>> Summary:
>>>> - fold atomic.inline.hpp into atomic.hpp
>>>> - rename atomic_*.inline.hpp files to atomic_*.hpp
>>>> - only include atomic.hpp where needed
>>>> - remove unnecessary additional includes
>>>>
>>>> I need someone to confirm these changes build fine on: ppc, aarch64 and
>>>> zero please.
>>>>
>>>> Thanks,
>>>> David
More information about the hotspot-dev
mailing list