[hs] RFR (L): 8010319: Implementation of JEP 181: Nest-Based Access Control

[Doerr, Martin]

Hi David,

can you apply the following small patch to fix ppc64 and s390 builds, please?

Best regards,
Martin


diff -r 70d41ef93cf0 src/hotspot/cpu/ppc/templateTable_ppc_64.cpp
--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp      Wed May 30 12:08:14 2018 +0200
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp      Wed May 30 12:24:00 2018 +0200
@@ -3608,10 +3608,10 @@
   __ testbitdi(CCR0, R0, Rflags, ConstantPoolCacheEntry::is_vfinal_shift);
   __ bfalse(CCR0, LnotVFinal);

-  __ check_klass_subtype(Rrecv_klass, Rinterface_klass, Rscratch, Rscratch1, subtype);
+  __ check_klass_subtype(Rrecv_klass, Rinterface_klass, Rscratch1, Rscratch2, L_subtype);
   // If we get here the typecheck failed
   __ b(L_no_such_interface);
-  __ bind(subtype);
+  __ bind(L_subtype);

   // do the call

diff -r 70d41ef93cf0 src/hotspot/cpu/s390/templateTable_s390.cpp
--- a/src/hotspot/cpu/s390/templateTable_s390.cpp       Wed May 30 12:08:14 2018 +0200
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp       Wed May 30 12:24:00 2018 +0200
@@ -3636,7 +3636,7 @@

   NearLabel subtype, no_such_interface;

-  __ check_klass_subtype(klass, interface, Z_tmp_2, Z_temp_3, subtype);
+  __ check_klass_subtype(klass, interface, Z_tmp_2, Z_tmp_3, subtype);
   // If we get here the typecheck failed
   __ z_bru(no_such_interface);
   __ bind(subtype);