Merge

jdk/make/src/classes/build/tools/module/boot.modules

@@ -29,3 +29,4 @@ jdk.sctp
 jdk.security.auth
 jdk.security.jgss
 jdk.snmp
+jdk.vm.ci

jdk/src/java.management/share/classes/sun/management/CompilerThreadStat.java

@@ -27,6 +27,7 @@ package sun.management;
 
 /**
  */
+@Deprecated
 public class CompilerThreadStat implements java.io.Serializable {
     private String name;
     private long taskCount;

jdk/src/java.management/share/classes/sun/management/HotspotCompilation.java

@@ -90,6 +90,7 @@ class HotspotCompilation
             this.time = (LongCounter) lookup(basename + "time");
         }
 
+        @SuppressWarnings("deprecation")
         CompilerThreadStat getCompilerThreadStat() {
             MethodInfo minfo = new MethodInfo(method.stringValue(),
                                               (int) type.longValue(),
@@ -182,6 +183,7 @@ class HotspotCompilation
         return nmethodSize.longValue();
     }
 
+    @Deprecated
     public List<CompilerThreadStat> getCompilerThreadStats() {
         List<CompilerThreadStat> list = new ArrayList<>(threads.size());
         for (CompilerThreadInfo info : threads) {

jdk/src/java.management/share/classes/sun/management/HotspotCompilationMBean.java

@@ -46,6 +46,7 @@ public interface HotspotCompilationMBean {
      * the statistic of a compiler thread.
      *
      */
+    @Deprecated
     public java.util.List<CompilerThreadStat> getCompilerThreadStats();
 
     /**