--- a/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java	Fri Aug 31 16:39:35 2012 -0700
+++ b/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java	Sat Sep 01 13:25:18 2012 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,18 +44,20 @@
   private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
     Type type      = db.lookupType("ciObjectFactory");
     unloadedMethodsField = type.getAddressField("_unloaded_methods");
-    ciObjectsField = type.getAddressField("_ci_objects");
+    ciMetadataField = type.getAddressField("_ci_metadata");
     symbolsField = type.getAddressField("_symbols");
 
     ciObjectConstructor = new VirtualBaseConstructor<ciObject>(db, db.lookupType("ciObject"), "sun.jvm.hotspot.ci", ciObject.class);
+    ciMetadataConstructor = new VirtualBaseConstructor<ciMetadata>(db, db.lookupType("ciMetadata"), "sun.jvm.hotspot.ci", ciMetadata.class);
     ciSymbolConstructor = new VirtualBaseConstructor<ciSymbol>(db, db.lookupType("ciSymbol"), "sun.jvm.hotspot.ci", ciSymbol.class);
   }
 
   private static AddressField unloadedMethodsField;
-  private static AddressField ciObjectsField;
+  private static AddressField ciMetadataField;
   private static AddressField symbolsField;
 
   private static VirtualBaseConstructor<ciObject> ciObjectConstructor;
+  private static VirtualBaseConstructor<ciMetadata> ciMetadataConstructor;
   private static VirtualBaseConstructor<ciSymbol> ciSymbolConstructor;
 
   public static ciObject get(Address addr) {
@@ -64,8 +66,14 @@
     return (ciObject)ciObjectConstructor.instantiateWrapperFor(addr);
   }
 
-  public GrowableArray<ciObject> objects() {
-    return GrowableArray.create(ciObjectsField.getValue(getAddress()), ciObjectConstructor);
+  public static ciMetadata getMetadata(Address addr) {
+    if (addr == null) return null;
+
+    return (ciMetadata)ciMetadataConstructor.instantiateWrapperFor(addr);
+  }
+
+  public GrowableArray<ciMetadata> objects() {
+    return GrowableArray.create(ciMetadataField.getValue(getAddress()), ciMetadataConstructor);
   }
 
   public GrowableArray<ciSymbol> symbols() {