--- old/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java	2020-01-23 18:12:07.213162568 -0800
+++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java	2020-01-23 18:12:06.949151071 -0800
@@ -50,7 +50,7 @@
 import com.sun.tools.javac.util.ClientCodeException;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.Log;
-import jdk.javadoc.internal.tool.ToolOption;
+import jdk.javadoc.internal.tool.ToolOptions;
 
 /**
  * Provides access to functionality specific to the JDK documentation tool,
@@ -170,13 +170,7 @@
     public int isSupportedOption(String option) {
         if (option == null)
             throw new NullPointerException();
-        for (ToolOption o : ToolOption.values()) {
-            for (String name : o.names) {
-                if (name.equals(option))
-                    return o.hasArg ? 1 : 0;
-            }
-        }
-        return -1;
+        return ToolOptions.isSupportedOption(option);
     }
 
 }