RFR(XS): 8232151: Minimal VM build broken after JDK-8232050
Jie Fu
fujie at loongson.cn
Fri Oct 11 11:57:26 UTC 2019
Thanks again, Christoph.
On 2019/10/11 下午7:53, Langer, Christoph wrote:
> Oh, that came too late... Just pushed http://hg.openjdk.java.net/jdk/jdk/rev/8c3c39710a08.
>
> I hope Claes, you can live with it :)
>
> /Christoph
>
>> -----Original Message-----
>> From: Jie Fu <fujie at loongson.cn>
>> Sent: Freitag, 11. Oktober 2019 13:50
>> To: Langer, Christoph <christoph.langer at sap.com>; hotspot-runtime-
>> dev at openjdk.java.net
>> Cc: David Holmes <david.holmes at oracle.com>; Baesken, Matthias
>> <matthias.baesken at sap.com>
>> Subject: Re: RFR(XS): 8232151: Minimal VM build broken after JDK-8232050
>>
>> Hi Christoph,
>>
>> Thank you so much.
>>
>> Updated: http://cr.openjdk.java.net/~jiefu/8232151/webrev.02/
>> - just updated the reviewers.
>>
>> Best regards,
>> Jie
>>
>> On 2019/10/11 下午7:39, Langer, Christoph wrote:
>>> Hi Jie,
>>>
>>> great, thanks for incorporating my additions. I'll push this shortly.
>>>
>>> Best regards
>>> Christoph
>>>
>>>
>>>> -----Original Message-----
>>>> From: Jie Fu <fujie at loongson.cn>
>>>> Sent: Freitag, 11. Oktober 2019 12:04
>>>> To: Langer, Christoph <christoph.langer at sap.com>; hotspot-runtime-
>>>> dev at openjdk.java.net
>>>> Cc: David Holmes <david.holmes at oracle.com>; Baesken, Matthias
>>>> <matthias.baesken at sap.com>
>>>> Subject: Re: RFR(XS): 8232151: Minimal VM build broken after JDK-
>> 8232050
>>>> Hi Christoph,
>>>>
>>>> Thank you for you review and valuable comments.
>>>> Updated: http://cr.openjdk.java.net/~jiefu/8232151/webrev.01/
>>>>
>>>> Testing:
>>>> Build tests for {minimal-release, server-release} on Linux/x64.
>>>>
>>>> If the fix is OK, could you please sponsor it?
>>>>
>>>> Thanks a lot.
>>>> Best regards,
>>>> Jie
>>>>
>>>> On 2019/10/11 下午5:32, Langer, Christoph wrote:
>>>>> Hi Jie,
>>>>>
>>>>> your fix looks good.
>>>>>
>>>>> Could you please also add the following additional places? The AIX build
>> is
>>>> broken as well and I guess linux390 without precompiled headers would
>> fail
>>>> as well.
>>>>
>>>> Done. Thanks.
>>>>
>>>>
>>>>> Thank you
>>>>> Christoph
>>>>>
>>>>> diff --git a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
>>>> b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
>>>>> --- a/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
>>>>> +++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
>>>>> @@ -32,6 +32,7 @@
>>>>> #include "interpreter/interpreter.hpp"
>>>>> #include "memory/resourceArea.hpp"
>>>>> #include "nativeInst_ppc.hpp"
>>>>> +#include "oops/klass.inline.hpp"
>>>>> #include "prims/methodHandles.hpp"
>>>>> #include "runtime/biasedLocking.hpp"
>>>>> #include "runtime/icache.hpp"
>>>>> diff --git a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
>>>> b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
>>>>> --- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
>>>>> +++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
>>>>> @@ -32,6 +32,7 @@
>>>>> #include "interpreter/templateInterpreter.hpp"
>>>>> #include "interpreter/templateTable.hpp"
>>>>> #include "memory/universe.hpp"
>>>>> +#include "oops/klass.inline.hpp"
>>>>> #include "oops/objArrayKlass.hpp"
>>>>> #include "oops/oop.inline.hpp"
>>>>> #include "prims/methodHandles.hpp"
>>>>> diff --git a/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
>>>> b/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
>>>>> --- a/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
>>>>> +++ b/src/hotspot/cpu/ppc/vtableStubs_ppc_64.cpp
>>>>> @@ -30,6 +30,7 @@
>>>>> #include "memory/resourceArea.hpp"
>>>>> #include "oops/compiledICHolder.hpp"
>>>>> #include "oops/instanceKlass.hpp"
>>>>> +#include "oops/klass.inline.hpp"
>>>>> #include "oops/klassVtable.hpp"
>>>>> #include "runtime/sharedRuntime.hpp"
>>>>> #include "vmreg_ppc.inline.hpp"
>>>>> diff --git a/src/hotspot/cpu/s390/vtableStubs_s390.cpp
>>>> b/src/hotspot/cpu/s390/vtableStubs_s390.cpp
>>>>> --- a/src/hotspot/cpu/s390/vtableStubs_s390.cpp
>>>>> +++ b/src/hotspot/cpu/s390/vtableStubs_s390.cpp
>>>>> @@ -30,6 +30,7 @@
>>>>> #include "memory/resourceArea.hpp"
>>>>> #include "oops/compiledICHolder.hpp"
>>>>> #include "oops/instanceKlass.hpp"
>>>>> +#include "oops/klass.inline.hpp"
>>>>> #include "oops/klassVtable.hpp"
>>>>> #include "runtime/sharedRuntime.hpp"
>>>>> #include "vmreg_s390.inline.hpp"
>>>>> diff --git a/src/hotspot/share/opto/library_call.cpp
>>>> b/src/hotspot/share/opto/library_call.cpp
>>>>> --- a/src/hotspot/share/opto/library_call.cpp
>>>>> +++ b/src/hotspot/share/opto/library_call.cpp
>>>>> @@ -32,6 +32,7 @@
>>>>> #include "gc/shared/barrierSet.hpp"
>>>>> #include "jfr/support/jfrIntrinsics.hpp"
>>>>> #include "memory/resourceArea.hpp"
>>>>> +#include "oops/klass.inline.hpp"
>>>>> #include "oops/objArrayKlass.hpp"
>>>>> #include "opto/addnode.hpp"
>>>>> #include "opto/arraycopynode.hpp"
>>>>>
>>>>>
>>>>>> -----Original Message-----
>>>>>> From: hotspot-runtime-dev <hotspot-runtime-dev-
>>>>>> bounces at openjdk.java.net> On Behalf Of David Holmes
>>>>>> Sent: Freitag, 11. Oktober 2019 08:58
>>>>>> To: Jie Fu <fujie at loongson.cn>; hotspot-runtime-
>> dev at openjdk.java.net
>>>>>> Subject: Re: RFR(XS): 8232151: Minimal VM build broken after JDK-
>>>> 8232050
>>>>>> Hi Jie,
>>>>>>
>>>>>> Fix looks good. Sorry about the breakage. I thought we still had one
>>>>>> test build of Minimal VM in our CI but it seems not. :(
>>>>>>
>>>>>> Thanks,
>>>>>> David
>>>>>>
>>>>>> On 11/10/2019 1:10 pm, Jie Fu wrote:
>>>>>>> Hi all,
>>>>>>>
>>>>>>> Could you please review the following fix?
>>>>>>>
>>>>>>> JBS: https://bugs.openjdk.java.net/browse/JDK-8232151
>>>>>>> Webrev: http://cr.openjdk.java.net/~jiefu/8232151/webrev.00/
>>>>>>>
>>>>>>> The patch just added #include "oops/klass.inline.hpp" in the following
>>>>>>> cpps:
>>>>>>> - ./sparc/sharedRuntime_sparc.cpp
>>>>>>> - ./s390/sharedRuntime_s390.cpp
>>>>>>> - ./ppc/sharedRuntime_ppc.cpp
>>>>>>> - ./arm/sharedRuntime_arm.cpp
>>>>>>> - ./x86/sharedRuntime_x86_64.cpp
>>>>>>> - ./x86/sharedRuntime_x86_32.cpp
>>>>>>> - ./aarch64/sharedRuntime_aarch64.cpp
>>>>>>>
>>>>>>> Testing:
>>>>>>> Build tests for {minimal-release, server-fastdebug, server-release,
>>>>>>> zero-release} on Linux/x64.
>>>>>>> Please note that to fully build minimal-release, one more fix for
>>>>>>> JDK-8232083 is needed [1].
>>>>>>>
>>>>>>> Thanks a lot.
>>>>>>> Best regards,
>>>>>>> Jie
>>>>>>>
>>>>>>> [1] http://cr.openjdk.java.net/~jiefu/8232083/webrev.00/
>>>>>>>
>>>>>>>
More information about the hotspot-runtime-dev
mailing list