--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java	2016-08-05 14:30:57.000000000 -0700
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/main/OptionHelper.java	2016-08-05 14:30:57.000000000 -0700
@@ -27,6 +27,7 @@
 
 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;
 
@@ -63,6 +64,9 @@
     /** 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);
 
@@ -113,6 +117,11 @@
         }
 
         @Override
+        void error(JCDiagnostic.Error error) {
+            throw new IllegalArgumentException(log.localize(error));
+        }
+
+        @Override
         public void addFile(Path p) {
             throw new IllegalArgumentException(p.toString());
         }