RFR(S): 8198750: [s390+x86_32] Fix build after jdk-8195142

[Doerr, Martin]

Hi Thomas and Aleksey,

thanks for the quick review and the aarch64 part.
Pushed.

Best regards,
Martin


-----Original Message-----
From: Aleksey Shipilev [mailto:shade at redhat.com] 
Sent: Dienstag, 27. Februar 2018 11:40
To: Doerr, Martin <martin.doerr at sap.com>; hotspot-runtime-dev at openjdk.java.net
Subject: Re: RFR(S): 8198750: [s390+x86_32] Fix build after jdk-8195142

It is a really simple omission:

diff -r 6ecca4a9c75f src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	Mon Feb 26 16:33:48 2018 +0100
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp	Tue Feb 27 11:39:39 2018 +0100
@@ -4514,7 +4514,7 @@

 void MacroAssembler::load_byte_map_base(Register reg) {
   jbyte *byte_map_base =
-    ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base;
+    ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->card_table()->byte_map_base();

   if (is_valid_AArch64_address((address)byte_map_base)) {
     // Strictly speaking the byte_map_base isn't an address at all,


Thanks!

-Aleksey

On 02/27/2018 11:37 AM, Doerr, Martin wrote:
> Hi Aleksey,
> 
> yes. Please send me the patch. I'll push it with my change.
> 
> Best regards,
> Martin
> 
> 
> -----Original Message-----
> From: Aleksey Shipilev [mailto:shade at redhat.com] 
> Sent: Dienstag, 27. Februar 2018 11:30
> To: Doerr, Martin <martin.doerr at sap.com>; hotspot-runtime-dev at openjdk.java.net
> Subject: Re: RFR(S): 8198750: [s390+x86_32] Fix build after jdk-8195142
> 
> On 02/27/2018 11:20 AM, Doerr, Martin wrote:
>> Hi,
>>
>> please review this small build fix for s390 and x86_32:
>> http://cr.openjdk.java.net/~mdoerr/8198750_s390_x86_build/webrev.00/
> 
> I think AArch64 is also broken, can you put the fix for it in your changeset too?
> 
> /pool/buildbot/slaves/sobornost/jdkX-hs/build/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp:4517:62:
> error: ‘class CardTableModRefBS’ has no member named ‘byte_map_base’
>      ((CardTableModRefBS*)(Universe::heap()->barrier_set()))->byte_map_base;
>                                                               ^~~~~~~~~~~~~
> I can give you the fix soon-ish.
> 
> -Aleksey
>