--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java	Mon Aug 29 18:14:26 2016 +0200
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java	Mon Aug 29 07:46:37 2016 -0700
@@ -44,6 +44,7 @@
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
+import javax.tools.JavaFileManager.Location;
 import javax.tools.JavaFileObject;
 
 import com.sun.source.tree.CompilationUnitTree;
@@ -57,6 +58,7 @@
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
+import com.sun.tools.javac.code.Symbol.ModuleSymbol;
 import com.sun.tools.javac.code.Symbol.VarSymbol;
 import com.sun.tools.javac.comp.AttrContext;
 import com.sun.tools.javac.comp.Env;
@@ -289,6 +291,14 @@
         return ((DocEnvImpl)(configuration.docEnv)).etable.shouldDocument(e);
     }
 
+    // TODO: jx.l.m ?
+    public Location getLocationForModule(ModuleElement mdle) {
+        ModuleSymbol msym = (ModuleSymbol)mdle;
+        return msym.sourceLocation != null
+                ? msym.sourceLocation
+                : msym.classLocation;
+    }
+
     //------------------Start of Serializable Implementation---------------------//
     private final static Map<TypeElement, NewSerializedForm> serializedForms = new HashMap<>();