# HG changeset patch
# User jiangli
# Date 1447979447 18000
# Node ID 43ac874b754ccfe6b7211c54e6814b5c40eecfa7
# Parent  210cb6523c6e9968e6892b615e7d91dbc33585dc# Parent  aefdf48bab17e48cc263058b232097ac388c8ca1
Merge

diff -r aefdf48bab17 -r 43ac874b754c modules.xml
--- a/modules.xml	Thu Nov 12 14:12:53 2015 -0800
+++ b/modules.xml	Thu Nov 19 19:30:47 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>
diff -r aefdf48bab17 -r 43ac874b754c test/lib/sun/hotspot/WhiteBox.java
--- a/test/lib/sun/hotspot/WhiteBox.java	Thu Nov 12 14:12:53 2015 -0800
+++ b/test/lib/sun/hotspot/WhiteBox.java	Thu Nov 19 19:30:47 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();
 }