--- old/langtools/make/tools/crules/MutableFieldsAnalyzer.java	2016-05-20 13:14:19.071201791 -0700
+++ new/langtools/make/tools/crules/MutableFieldsAnalyzer.java	2016-05-20 13:14:18.963197164 -0700
@@ -99,12 +99,14 @@
         ignoreFields("com.sun.tools.javac.code.Type", "moreInfo");
         ignoreFields("com.sun.tools.javac.util.SharedNameTable", "freelist");
         ignoreFields("com.sun.tools.javac.util.Log", "useRawMessages");
-        ignoreFields("com.sun.tools.javac.util.ModuleWrappers$ModuleFinderHelper",
-                "moduleFinderInterface", "ofMethod", "emptyMethod");
-        ignoreFields("com.sun.tools.javac.util.ModuleWrappers$ConfigurationHelper",
+        ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$ModuleFinder",
+                "moduleFinderClass", "ofMethod");
+        ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$Configuration",
                 "configurationClass", "resolveRequiresAndUsesMethod");
-        ignoreFields("com.sun.tools.javac.util.ModuleWrappers$LayerHelper",
+        ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$Layer",
                 "layerClass", "bootMethod", "defineModulesWithOneLoaderMethod", "configurationMethod");
+        ignoreFields("com.sun.tools.javac.util.JDK9Wrappers$ServiceLoaderHelper",
+                "loadMethod");
         ignoreFields("com.sun.tools.javac.util.ModuleHelper",
                 "addExportsMethod", "getUnnamedModuleMethod", "getModuleMethod");
     }