--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java	Fri Mar 25 11:51:53 2016
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java	Fri Mar 25 11:51:53 2016
@@ -629,10 +629,19 @@
      */
     private Env<AttrContext> getEnterEnv(Symbol sym) {
         // Get enclosing class of sym, or sym itself if it is a class
-        // or package.
-        TypeSymbol ts = (sym.kind != PCK)
-                        ? sym.enclClass()
-                        : (PackageSymbol) sym;
+        // package, or module.
+     
+        TypeSymbol ts = null;
+        switch(sym.kind) {
+            case PCK:
+                ts = (PackageSymbol)sym;
+                break;
+            case MDL:
+                ts = (ModuleSymbol)sym;
+                break;
+            default:
+                sym.enclClass();
+        }
         return (ts != null)
                 ? enter.getEnv(ts)
                 : null;
--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Fri Mar 25 11:51:54 2016
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Fri Mar 25 11:51:54 2016
@@ -615,6 +615,10 @@
                 if (that.packge == sym) result = that;
                 else super.visitTopLevel(that);
             }
+            public void visitModuleDef(JCModuleDecl that) {
+                if (that.sym == sym) result = that;
+                else super.visitModuleDef(that);               
+            }
             public void visitPackageDef(JCPackageDecl that) {
                 if (that.packge == sym) result = that;
                 else super.visitPackageDef(that);