Urgent RFR(T): 8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp
Daniel D. Daugherty
daniel.daugherty at oracle.com
Wed Dec 18 23:36:21 UTC 2019
My local Linux-X64 'release' bits build passed so odds are good that
JDK-8236226 is all we needed.
Dan
On 12/18/19 6:23 PM, Daniel D. Daugherty wrote:
> The CI build failure was how I saw the problem.
>
> This fix is pushed. I have a Linux-X64 build going now.
>
> Dan
>
>
> On 12/18/19 6:21 PM, David Holmes wrote:
>> Too late :(
>>
>> On 19/12/2019 9:20 am, David Holmes wrote:
>>> Push it now and try to avoid CI failure. :)
>>>
>>> David
>>>
>>> On 19/12/2019 9:19 am, Daniel D. Daugherty wrote:
>>>> Thanks! Should I push this fix in hopes that it is the only merge
>>>> error or should I do a Linux test build?
>>>>
>>>> Dan
>>>>
>>>>
>>>> On 12/18/19 6:19 PM, David Holmes wrote:
>>>>> Ship it!
>>>>>
>>>>> Thanks,
>>>>> David
>>>>>
>>>>> On 19/12/2019 9:14 am, Daniel D. Daugherty wrote:
>>>>>> Greetings,
>>>>>>
>>>>>> A merge error crept into the latest sync from JDK14 -> JDK15. I
>>>>>> consider
>>>>>> this a trivial fix.
>>>>>>
>>>>>> Here's the context diff:
>>>>>>
>>>>>> $ hg diff
>>>>>> diff -r 87266ac324d7 src/hotspot/share/gc/z/zRootsIterator.cpp
>>>>>> --- a/src/hotspot/share/gc/z/zRootsIterator.cpp Wed Dec 18
>>>>>> 23:46:55 2019 +0100
>>>>>> +++ b/src/hotspot/share/gc/z/zRootsIterator.cpp Wed Dec 18
>>>>>> 18:11:08 2019 -0500
>>>>>> @@ -44,7 +44,8 @@
>>>>>> #include "memory/universe.hpp"
>>>>>> #include "prims/jvmtiExport.hpp"
>>>>>> #include "prims/resolvedMethodTable.hpp"
>>>>>> -#include "runtime/atomic.hpp"#include "runtime/safepoint.hpp"
>>>>>> +#include "runtime/atomic.hpp"
>>>>>> +#include "runtime/safepoint.hpp"
>>>>>> #include "runtime/synchronizer.hpp"
>>>>>> #include "runtime/thread.hpp"
>>>>>> #include "runtime/vmThread.hpp"
>>>>>>
>>>>>>
>>>>>> Thanks, in advance, for any comments, questions or suggestions.
>>>>>>
>>>>>> Dan
>>>>>>
>>>>
>
>
More information about the hotspot-dev
mailing list