langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java

@@ -25,10 +25,11 @@
 
 package com.sun.tools.javac.main;
 
 import java.nio.file.Path;
 
+import com.sun.tools.javac.util.JCDiagnostic;
 import com.sun.tools.javac.util.Log;
 import com.sun.tools.javac.util.Log.PrefixKind;
 
 /**
  * Helper object to be used by {@link Option#process}, providing access to

@@ -61,10 +62,13 @@
     public abstract String getOwnName();
 
     /** Report an error. */
     abstract void error(String key, Object... args);
 
+    /** Report an error. */
+    abstract void error(JCDiagnostic.Error error);
+
     /** Record a file to be compiled. */
     abstract void addFile(Path p);
 
     /** Record the name of a class for annotation processing. */
     abstract void addClassName(String s);

@@ -111,10 +115,15 @@
         void error(String key, Object... args) {
             throw new IllegalArgumentException(log.localize(PrefixKind.JAVAC, key, args));
         }
 
         @Override
+        void error(JCDiagnostic.Error error) {
+            throw new IllegalArgumentException(log.localize(error));
+        }
+
+        @Override
         public void addFile(Path p) {
             throw new IllegalArgumentException(p.toString());
         }
 
         @Override