RFR: 8076457: Fix includes of inline.hpp in GC code

Jon Masamitsu jon.masamitsu at oracle.com
Thu Apr 2 13:27:41 UTC 2015



On 04/02/2015 12:30 AM, Stefan Karlsson wrote:
>
>
> On 2015-04-02 07:13, Jon Masamitsu wrote:
>>
>>
>> On 4/1/2015 1:03 PM, Stefan Karlsson wrote:
>>> On 2015-04-01 21:09, Jon Masamitsu wrote:
>>>> Changes look correct.  Small question.
>>>>
>>>> http://cr.openjdk.java.net/~stefank/8076457/webrev.01/src/share/vm/runtime/thread.cpp.udiff.html 
>>>>
>>>>
>>>> +// Non-inlined version to be used where thread.inline.hpp 
>>>> shouldn't be included.
>>>>
>>>>
>>>> Would this be more accurate?
>>>>
>>>> // Non-inlined version to be used where thread.inline.hpp does not 
>>>> need to be included
>>>>
>>>> Minor point.  You can decide.  I don'tneed  to see the final comment.
>>>
>>> I wanted to convey that it's a way out for places where we are not 
>>> "allowed" to include thread.inline.hpp. Given that, if you still 
>>> think your version is better, I'll change it to your wording.
>>>
>>>> Reviewed.
>>>
>>> Thanks!
>>>
>>>>
>>>> The changes do a bit more than deal with includes of various 
>>>> *.inline.hpp.
>>>
>>> What part are you referring to? The added includes, forward 
>>> declarations and the Thread::current_noinline() are all needed to be 
>>> able to get rid of the inline.hpp includes.
>>
>> http://cr.openjdk.java.net/~stefank/8076457/webrev.01/src/share/vm/gc_implementation/g1/g1StringDedupTable.hpp.udiff.html 
>>
>>
>> Was this change part of fixing up the inline.hpp?
>
> Yes.
>
> Previously, the cpp files that included g1StringDedupTable.hpp also 
> included g1StringDedup.hpp, either directly or indirectly. I removed 
> one of the paths to g1StringDedup.hpp:
> space.inline.hpp
>  markSweep.inline.hpp
>   g1StringDedup.hpp
>
> when I removed the inclusion of space.inline.hpp from some of the hpp 
> files.

Ok.  The description on the CR is fine then.

Jon

>
> StefanK
>
>
>>
>> Jon
>>
>>>
>>> Thanks,
>>> StefanK
>>>>
>>>> Should the description of in the CR be a more general
>>>>
>>>> "Fix more includes in GC code".
>>>>
>>>> https://bugs.openjdk.java.net/browse/JDK-8076457
>>>>
>>>> Jon
>>>>
>>>>
>>>> On 4/1/2015 4:51 AM, Stefan Karlsson wrote:
>>>>> Hi,
>>>>>
>>>>> Please review this patch to fix the last few places in the GC code 
>>>>> where inline.hpp files are included from hpp files.
>>>>>
>>>>> http://cr.openjdk.java.net/~stefank/8076457/webrev.01/
>>>>> https://bugs.openjdk.java.net/browse/JDK-8076457
>>>>>
>>>>> This patch builds upon the patch in:
>>>>> http://mail.openjdk.java.net/pipermail/hotspot-gc-dev/2015-April/012607.html 
>>>>>
>>>>>
>>>>> Thanks,
>>>>> StefanK
>>>>
>>>
>>
>



More information about the hotspot-gc-dev mailing list