# HG changeset patch
# User Dusan Balek <dbalek@netbeans.org>
# Date 1501846352 -7200
# Node ID 15c0d1682895ad250a0f23ce8eef1fd873f4d8e4
# Parent  f54cccaf6e6cd93bf55fe8fd2c871efcf0c49360
Issue #271211 - NullPointerException at com.sun.tools.javac.comp.Enter.lambda$visitTopLevel$1 - fixed.

diff -r f54cccaf6e6c -r 15c0d1682895 make/netbeans/nb-javac/nbproject/build-impl.xml
--- a/make/netbeans/nb-javac/nbproject/build-impl.xml	Mon Jul 31 11:07:41 2017 +0200
+++ b/make/netbeans/nb-javac/nbproject/build-impl.xml	Fri Aug 04 13:32:32 2017 +0200
@@ -339,10 +339,18 @@
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="${empty.dir}" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
+            <attribute default="${src.classes2.dir}:${src.classes3.dir}:${src.classes5.dir}:${src.classes4.dir}" if:set="named.module.internal" name="sourcepath"/>
             <attribute default="${empty.dir}" name="gensrcdir"/>
             <element name="customize" optional="true"/>
             <sequential>
+                <condition property="warn.excludes.internal">
+                    <and>
+                        <isset property="named.module.internal"/>
+                        <length length="0" string="@{excludes}" trim="true" when="greater"/>
+                    </and>
+                </condition>
+                <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
                 <property location="${build.dir}/empty" name="empty.dir"/>
                 <mkdir dir="${empty.dir}"/>
                 <mkdir dir="@{apgeneratedsrcdir}"/>
@@ -1562,7 +1570,13 @@
     </target>
     <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
         <j2seproject3:modulename property="test.module.name" sourcepath="${test.test.dir}"/>
-        <condition else="-Xmodule:${module.name} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
+        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.test.dir}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="--patch-module ${module.name}=${test.test.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
             <and>
                 <isset property="test.module.name"/>
                 <length length="0" string="${test.module.name}" when="greater"/>
@@ -1597,6 +1611,7 @@
         </condition>
     </target>
     <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
+        <property name="javac.test.sourcepath" value="${empty.dir}"/>
         <property name="javac.test.compilerargs" value=""/>
         <property name="run.test.jvmargs" value=""/>
     </target>
@@ -1605,7 +1620,7 @@
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.test.dir}"/>
     </target>
     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" srcdir="${test.test.dir}">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.test.dir}">
             <customize>
                 <compilerarg line="${javac.test.compilerargs}"/>
             </customize>
diff -r f54cccaf6e6c -r 15c0d1682895 make/netbeans/nb-javac/nbproject/genfiles.properties
--- a/make/netbeans/nb-javac/nbproject/genfiles.properties	Mon Jul 31 11:07:41 2017 +0200
+++ b/make/netbeans/nb-javac/nbproject/genfiles.properties	Fri Aug 04 13:32:32 2017 +0200
@@ -4,5 +4,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=716b253f
-nbproject/build-impl.xml.script.CRC32=a1dd8e75
-nbproject/build-impl.xml.stylesheet.CRC32=b9adb2c8@1.88.0.48
+nbproject/build-impl.xml.script.CRC32=7f8d6ed3
+nbproject/build-impl.xml.stylesheet.CRC32=bade6ae5@1.88.0.48
diff -r f54cccaf6e6c -r 15c0d1682895 src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java	Mon Jul 31 11:07:41 2017 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java	Fri Aug 04 13:32:32 2017 +0200
@@ -389,7 +389,7 @@
                 syms.listPackageModules(tree.packge.fullname)
                     .stream()
                     .filter(m -> m != tree.modle)
-                    .filter(cand -> visiblePackages.get(tree.packge.fullname) == syms.getPackage(cand, tree.packge.fullname))
+                    .filter(cand -> visiblePackages != null && visiblePackages.get(tree.packge.fullname) == syms.getPackage(cand, tree.packge.fullname))
                     .findAny();
 
             if (dependencyWithPackage.isPresent()) {