--- a/modules.xml	Fri Nov 06 11:11:51 2015 -0800
+++ b/modules.xml	Wed Jul 22 20:14:16 2015 -0700
@@ -340,6 +340,7 @@
       <to>java.sql</to>
       <to>java.sql.rowset</to>
       <to>jdk.scripting.nashorn</to>
+      <to>jdk.vm.cds</to>
     </export>
     <export>
       <name>sun.reflect.annotation</name>

--- a/test/lib/sun/hotspot/WhiteBox.java	Fri Nov 06 11:11:51 2015 -0800
+++ b/test/lib/sun/hotspot/WhiteBox.java	Wed Jul 22 20:14:16 2015 -0700
@@ -407,6 +407,7 @@
   public native void assertMatchingSafepointCalls(boolean mutexSafepointValue, boolean attemptedNoSafepointValue);
 
   // Sharing
+  public native boolean isSharedClass(Class<?> c);
   public native boolean isShared(Object o);
   public native boolean areSharedStringsIgnored();
 }