--- old/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java	2020-01-23 18:12:08.741229109 -0800
+++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/JavadocTool.java	2020-01-23 18:12:08.405214476 -0800
@@ -32,7 +32,6 @@
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import javax.lang.model.element.Element;
@@ -121,18 +120,18 @@
 
             return new JavadocTool(context);
         } catch (CompletionFailure ex) {
+            assert messager != null;
             messager.error(Position.NOPOS, ex.getMessage());
             return null;
         }
     }
 
-    public DocletEnvironment getEnvironment(Map<ToolOption,
-            Object> jdtoolOpts,
+    public DocletEnvironment getEnvironment(ToolOptions toolOptions,
             List<String> javaNames,
             Iterable<? extends JavaFileObject> fileObjects) throws ToolException {
         toolEnv = ToolEnvironment.instance(context);
-        toolEnv.initialize(jdtoolOpts);
-        ElementsTable etable = new ElementsTable(context, jdtoolOpts);
+        toolEnv.initialize(toolOptions);
+        ElementsTable etable = new ElementsTable(context, toolOptions);
         javadocFinder.sourceCompleter = etable.xclasses
                 ? Completer.NULL_COMPLETER
                 : sourceCompleter;