# HG changeset patch
# User neliasso
# Date 1446806042 -3600
# Node ID 31ae937694f941635d760cf304c9c30d753a9125
# Parent  b0459b292c36a88bf4c9d8e91ecb453b58d13560# Parent  229c18cf59b42a57171bb521baa5db56ac256d4f
Merge

diff -r b0459b292c36 -r 31ae937694f9 test/lib/sun/hotspot/code/CodeBlob.java
--- a/test/lib/sun/hotspot/code/CodeBlob.java	Thu Nov 05 19:31:19 2015 +0100
+++ b/test/lib/sun/hotspot/code/CodeBlob.java	Fri Nov 06 11:34:02 2015 +0100
@@ -47,22 +47,24 @@
     return new CodeBlob(obj);
   }
   protected CodeBlob(Object[] obj) {
-    assert obj.length == 3;
+    assert obj.length == 4;
     name = (String) obj[0];
     size = (Integer) obj[1];
     code_blob_type = BlobType.values()[(Integer) obj[2]];
     assert code_blob_type.id == (Integer) obj[2];
+    address = (Long) obj[3];
   }
   public final String name;
   public final int size;
   public final BlobType code_blob_type;
-
+  public final long address;
   @Override
   public String toString() {
     return "CodeBlob{"
         + "name=" + name
         + ", size=" + size
         + ", code_blob_type=" + code_blob_type
+        + ", address=" + address
         + '}';
   }
 }
diff -r b0459b292c36 -r 31ae937694f9 test/lib/sun/hotspot/code/NMethod.java
--- a/test/lib/sun/hotspot/code/NMethod.java	Thu Nov 05 19:31:19 2015 +0100
+++ b/test/lib/sun/hotspot/code/NMethod.java	Fri Nov 06 11:34:02 2015 +0100
@@ -39,12 +39,12 @@
     comp_level = (Integer) obj[1];
     insts = (byte[]) obj[2];
     compile_id = (Integer) obj[3];
-    address = (Long) obj[4];
+    entry_point = (Long) obj[4];
   }
   public final byte[] insts;
   public final int comp_level;
   public final int compile_id;
-  public final long address;
+  public final long entry_point;
 
   @Override
   public String toString() {
@@ -53,7 +53,7 @@
         + ", insts=" + insts
         + ", comp_level=" + comp_level
         + ", compile_id=" + compile_id
-        + ", address=" + address
+        + ", entry_point=" + entry_point
         + '}';
   }
 }