Fix type expectations

Author: liach

test/hotspot/jtreg/runtime/FieldLayout/BaseOffsets.java

@@ -110,8 +110,8 @@ static class LIClass {
     public static final WhiteBox WB = WhiteBox.getWhiteBox();
 
     static final long INT_OFFSET;
-    static final int  INT_ARRAY_OFFSET;
-    static final int  LONG_ARRAY_OFFSET;
+    static final long INT_ARRAY_OFFSET;
+    static final long LONG_ARRAY_OFFSET;
     static {
         if (!Platform.is64bit() || WB.getBooleanVMFlag("UseCompactObjectHeaders")) {
             INT_OFFSET = 8;
@@ -151,7 +151,7 @@ static public void main(String[] args) {
         Asserts.assertEquals(unsafe.arrayBaseOffset(double[].class),  LONG_ARRAY_OFFSET, "Misplaced double  array base");
         boolean narrowOops = System.getProperty("java.vm.compressedOopsMode") != null ||
                              !Platform.is64bit();
-        int expected_objary_offset = narrowOops ? INT_ARRAY_OFFSET : LONG_ARRAY_OFFSET;
+        long expected_objary_offset = narrowOops ? INT_ARRAY_OFFSET : LONG_ARRAY_OFFSET;
         Asserts.assertEquals(unsafe.arrayBaseOffset(Object[].class),  expected_objary_offset, "Misplaced object  array base");
     }
 }

test/hotspot/jtreg/runtime/Unsafe/GetField.java

@@ -37,11 +37,11 @@
 public class GetField {
     public static void main(String args[]) throws Exception {
         Unsafe unsafe = Unsafe.getUnsafe();
-        // Unsafe.INVALID_FIELD_OFFSET is a static final int field,
+        // Unsafe.INVALID_FIELD_OFFSET is a static final long field,
         // make sure getField returns the correct field
         Field field = Unsafe.class.getField("INVALID_FIELD_OFFSET");
         assertNotEquals(field.getModifiers() & Modifier.FINAL, 0);
         assertNotEquals(field.getModifiers() & Modifier.STATIC, 0);
-        assertEquals(field.getType(), int.class);
+        assertEquals(field.getType(), long.class);
     }
 }