--- old/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp	2020-06-17 15:03:23.202835891 +0200
+++ new/test/hotspot/gtest/gc/z/test_zPhysicalMemory.cpp	2020-06-17 15:03:23.018832796 +0200
@@ -31,22 +31,22 @@
 
   ZPhysicalMemory pmem0;
   pmem0.add_segment(seg0);
-  EXPECT_EQ(pmem0.nsegments(), 1u);
+  EXPECT_EQ(pmem0.nsegments(), 1);
   EXPECT_EQ(pmem0.segment(0).size(), 100u);
 
   ZPhysicalMemory pmem1;
   pmem1.add_segment(seg0);
   pmem1.add_segment(seg1);
-  EXPECT_EQ(pmem1.nsegments(), 2u);
+  EXPECT_EQ(pmem1.nsegments(), 2);
   EXPECT_EQ(pmem1.segment(0).size(), 100u);
   EXPECT_EQ(pmem1.segment(1).size(), 100u);
 
   ZPhysicalMemory pmem2(pmem0);
-  EXPECT_EQ(pmem2.nsegments(), 1u);
+  EXPECT_EQ(pmem2.nsegments(), 1);
   EXPECT_EQ(pmem2.segment(0).size(), 100u);
 
   pmem2 = pmem1;
-  EXPECT_EQ(pmem2.nsegments(), 2u);
+  EXPECT_EQ(pmem2.nsegments(), 2);
   EXPECT_EQ(pmem2.segment(0).size(), 100u);
   EXPECT_EQ(pmem2.segment(1).size(), 100u);
 }
@@ -61,7 +61,7 @@
   const ZPhysicalMemorySegment seg6(6, 1, true);
 
   ZPhysicalMemory pmem0;
-  EXPECT_EQ(pmem0.nsegments(), 0u);
+  EXPECT_EQ(pmem0.nsegments(), 0);
   EXPECT_EQ(pmem0.is_null(), true);
 
   ZPhysicalMemory pmem1;
@@ -72,7 +72,7 @@
   pmem1.add_segment(seg4);
   pmem1.add_segment(seg5);
   pmem1.add_segment(seg6);
-  EXPECT_EQ(pmem1.nsegments(), 1u);
+  EXPECT_EQ(pmem1.nsegments(), 1);
   EXPECT_EQ(pmem1.segment(0).size(), 7u);
   EXPECT_EQ(pmem1.is_null(), false);
 
@@ -83,7 +83,7 @@
   pmem2.add_segment(seg4);
   pmem2.add_segment(seg5);
   pmem2.add_segment(seg6);
-  EXPECT_EQ(pmem2.nsegments(), 2u);
+  EXPECT_EQ(pmem2.nsegments(), 2);
   EXPECT_EQ(pmem2.segment(0).size(), 3u);
   EXPECT_EQ(pmem2.segment(1).size(), 3u);
   EXPECT_EQ(pmem2.is_null(), false);
@@ -94,7 +94,7 @@
   pmem3.add_segment(seg3);
   pmem3.add_segment(seg4);
   pmem3.add_segment(seg6);
-  EXPECT_EQ(pmem3.nsegments(), 3u);
+  EXPECT_EQ(pmem3.nsegments(), 3);
   EXPECT_EQ(pmem3.segment(0).size(), 1u);
   EXPECT_EQ(pmem3.segment(1).size(), 3u);
   EXPECT_EQ(pmem3.segment(2).size(), 1u);
@@ -105,7 +105,7 @@
   pmem4.add_segment(seg2);
   pmem4.add_segment(seg4);
   pmem4.add_segment(seg6);
-  EXPECT_EQ(pmem4.nsegments(), 4u);
+  EXPECT_EQ(pmem4.nsegments(), 4);
   EXPECT_EQ(pmem4.segment(0).size(), 1u);
   EXPECT_EQ(pmem4.segment(1).size(), 1u);
   EXPECT_EQ(pmem4.segment(2).size(), 1u);
@@ -119,12 +119,12 @@
   pmem.add_segment(ZPhysicalMemorySegment(10, 10, true));
   pmem.add_segment(ZPhysicalMemorySegment(30, 10, true));
   pmem.add_segment(ZPhysicalMemorySegment(50, 10, true));
-  EXPECT_EQ(pmem.nsegments(), 3u);
+  EXPECT_EQ(pmem.nsegments(), 3);
   EXPECT_EQ(pmem.size(), 30u);
   EXPECT_FALSE(pmem.is_null());
 
   pmem.remove_segments();
-  EXPECT_EQ(pmem.nsegments(), 0u);
+  EXPECT_EQ(pmem.nsegments(), 0);
   EXPECT_EQ(pmem.size(), 0u);
   EXPECT_TRUE(pmem.is_null());
 }
@@ -135,25 +135,25 @@
   pmem.add_segment(ZPhysicalMemorySegment(0, 10, true));
   pmem.add_segment(ZPhysicalMemorySegment(10, 10, true));
   pmem.add_segment(ZPhysicalMemorySegment(30, 10, true));
-  EXPECT_EQ(pmem.nsegments(), 2u);
+  EXPECT_EQ(pmem.nsegments(), 2);
   EXPECT_EQ(pmem.size(), 30u);
 
   ZPhysicalMemory pmem0 = pmem.split(1);
-  EXPECT_EQ(pmem0.nsegments(), 1u);
+  EXPECT_EQ(pmem0.nsegments(), 1);
   EXPECT_EQ(pmem0.size(), 1u);
-  EXPECT_EQ(pmem.nsegments(), 2u);
+  EXPECT_EQ(pmem.nsegments(), 2);
   EXPECT_EQ(pmem.size(), 29u);
 
   ZPhysicalMemory pmem1 = pmem.split(25);
-  EXPECT_EQ(pmem1.nsegments(), 2u);
+  EXPECT_EQ(pmem1.nsegments(), 2);
   EXPECT_EQ(pmem1.size(), 25u);
-  EXPECT_EQ(pmem.nsegments(), 1u);
+  EXPECT_EQ(pmem.nsegments(), 1);
   EXPECT_EQ(pmem.size(), 4u);
 
   ZPhysicalMemory pmem2 = pmem.split(4);
-  EXPECT_EQ(pmem2.nsegments(), 1u);
+  EXPECT_EQ(pmem2.nsegments(), 1);
   EXPECT_EQ(pmem2.size(), 4u);
-  EXPECT_EQ(pmem.nsegments(), 0u);
+  EXPECT_EQ(pmem.nsegments(), 0);
   EXPECT_EQ(pmem.size(), 0u);
 }
 
@@ -163,12 +163,12 @@
   pmem0.add_segment(ZPhysicalMemorySegment(10, 10, false));
   pmem0.add_segment(ZPhysicalMemorySegment(20, 10, true));
   pmem0.add_segment(ZPhysicalMemorySegment(30, 10, false));
-  EXPECT_EQ(pmem0.nsegments(), 4u);
+  EXPECT_EQ(pmem0.nsegments(), 4);
   EXPECT_EQ(pmem0.size(), 40u);
 
   ZPhysicalMemory pmem1 = pmem0.split_committed();
-  EXPECT_EQ(pmem0.nsegments(), 2u);
+  EXPECT_EQ(pmem0.nsegments(), 2);
   EXPECT_EQ(pmem0.size(), 20u);
-  EXPECT_EQ(pmem1.nsegments(), 2u);
+  EXPECT_EQ(pmem1.nsegments(), 2);
   EXPECT_EQ(pmem1.size(), 20u);
 }