--- a/modules.xml	Fri Nov 20 19:25:45 2015 +0100
+++ b/modules.xml	Mon Nov 23 14:41:54 2015 -0500
@@ -343,6 +343,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 20 19:25:45 2015 +0100
+++ b/test/lib/sun/hotspot/WhiteBox.java	Mon Nov 23 14:41:54 2015 -0500
@@ -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();
 }