RFR (XS) 8210963: Build failures after "8210829: Modularize allocations in C2"

[Aleksey Shipilev]

Bug:
  https://bugs.openjdk.java.net/browse/JDK-8210963

Missing include for 32-bit platforms makes it fail x86_32 and arm32 builds. Also, uint/intx
inconsistency makes it fail even after includes are proper, because "lines" is now "intx". Seems
easier to fix uint->intx right at uses in for-loops, because "i" is only used for "i == 0"
comparisons in them.

Fix:

diff -r 1fd0f300d4b7 src/hotspot/share/gc/shared/c2/barrierSetC2.cpp
--- a/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp	Thu Sep 20 08:11:21 2018 -0400
+++ b/src/hotspot/share/gc/shared/c2/barrierSetC2.cpp	Thu Sep 20 15:49:02 2018 +0200
@@ -27,2 +27,3 @@
 #include "opto/arraycopynode.hpp"
+#include "opto/convertnode.hpp"
 #include "opto/graphKit.hpp"
diff -r 1fd0f300d4b7 src/hotspot/share/opto/macro.cpp
--- a/src/hotspot/share/opto/macro.cpp	Thu Sep 20 08:11:21 2018 -0400
+++ b/src/hotspot/share/opto/macro.cpp	Thu Sep 20 15:49:02 2018 +0200
@@ -1729,3 +1729,3 @@

-      for ( uint i = 0; i < lines; i++ ) {
+      for ( intx i = 0; i < lines; i++ ) {
         prefetch_adr = new AddPNode( old_pf_wm, new_pf_wmt,
@@ -1782,3 +1782,3 @@
       distance = step_size;
-      for ( uint i = 1; i < lines; i++ ) {
+      for ( intx i = 1; i < lines; i++ ) {
         prefetch_adr = new AddPNode( cache_adr, cache_adr,
@@ -1798,3 +1798,3 @@
       uint distance = AllocatePrefetchDistance;
-      for ( uint i = 0; i < lines; i++ ) {
+      for ( intx i = 0; i < lines; i++ ) {
         prefetch_adr = new AddPNode( old_eden_top, new_eden_top,


Testing: x86_64, x86_32, armhf builds

Thanks,
-Aleksey



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://mail.openjdk.java.net/pipermail/hotspot-compiler-dev/attachments/20180920/b755a180/signature.asc>