--- jsr166/build.xml	2018/03/21 23:10:39	1.269
+++ jsr166/build.xml	2018/06/03 16:16:47	1.272
@@ -1389,7 +1389,7 @@
 <!-- ==============================================================
   Experimental errorprone support - http://errorprone.info
 =================================================================== -->
-  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
+  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
   <property name="errorprone.jsr166.user.flags" value=""/>
   <property name="errorprone.jsr166.flags"
             value="-Xep:HashtableContains:OFF
@@ -1433,6 +1433,8 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+      <compilerarg value="-J--illegal-access=permit"/>
       <compilerarg value="-XDcompilePolicy=simple"/>
       <compilerarg line="-processorpath ${errorprone.jar}"/>
       <compilerarg value="-Xplugin:ErrorProne
@@ -1455,6 +1457,8 @@
       workdir="${build.dir}"
       classes="${product.jar}">
       <javac-elements>
+        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
+        <compilerarg value="-J--illegal-access=permit"/>
         <compilerarg value="-XDcompilePolicy=simple"/>
         <compilerarg line="-processorpath ${errorprone.jar}"/>
         <compilerarg value="-Xplugin:ErrorProne
@@ -1483,6 +1487,7 @@
         <arg value="-javacoption:-Xplugin:ErrorProne
                             ${errorprone.jsr166.flags}
                             ${errorprone.jsr166.test.flags}
+                            -Xep:MultipleTopLevelClasses:WARN
                             -Xep:NonAtomicVolatileUpdate:OFF"/>
       </jtreg-elements>
     </run-jtreg-tests>