Merge remote-tracking branch 'origin/2.10.x' into merge-2.10.x

* origin/2.10.x: (31 commits)
  Implicit vars should have non-implicit setters.
  Deprecate `scala.tools.nsc.Phases` because it's dead-code.
  scaladoc Template: remove duplicate code and several usages of Option.get.
  adds scala-reflect.jar to MIMA in ant
  Test showing the absence of a forward reference
  update mailmap
  Remove dead code from `Global`.
  Cleanup MemberLookup. Better explain ambiguous link targets.
  typedIdent no longer destroys attachments
  fixes incorrect handling of Annotated in lazy copier
  simplifies checkBounds
  Recurse into instantiations when stripping type vars.
  Extract base scaladoc functionality for the IDE.
  Expand pattern match position tests.
  SI-6288 Remedy ill-positioned extractor binding.
  SI-6288 Fix positioning of label jumps
  SI-6288 Position argument of unapply
  Fixes SI-6758: force LazyAnnnotationInfo for DefDef and TypeDef
  SI-6795 Simplify errors related to "abstract override" on type members
  SI-6795 Adds negative check for "abstract override" on types in traits
  ...

Conflicts:
	.mailmap
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/ast/DocComments.scala
	src/compiler/scala/tools/nsc/doc/base/CommentFactoryBase.scala
	src/compiler/scala/tools/nsc/doc/html/page/Source.scala
	src/compiler/scala/tools/nsc/doc/html/page/Template.scala
	src/compiler/scala/tools/nsc/doc/model/LinkTo.scala
	src/compiler/scala/tools/nsc/doc/model/MemberLookup.scala
	src/compiler/scala/tools/nsc/doc/model/diagram/DiagramFactory.scala
	src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/reflect/scala/reflect/runtime/JavaMirrors.scala
	test/scaladoc/run/links.scala

1 files changed, 10 insertions, 9 deletions

diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index f6ce19e1d7..57cfb8b515 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -568,7 +568,7 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
               case None =>
                 // class does not have a Scala signature; it's a Java class
                 info("translating reflection info for Java " + jclazz) //debug
-                initClassModule(clazz, module, new FromJavaClassCompleter(clazz, module, jclazz))
+                initClassAndModule(clazz, module, new FromJavaClassCompleter(clazz, module, jclazz))
             }
         }
       } catch {
@@ -670,9 +670,9 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
         def enter(sym: Symbol, mods: Int) =
           (if (jModifier.isStatic(mods)) module.moduleClass else clazz).info.decls enter sym
 
-        for (jinner <- jclazz.getDeclaredClasses) {
-          enter(jclassAsScala(jinner, clazz), jinner.getModifiers)
-        }
+        for (jinner <- jclazz.getDeclaredClasses)
+          jclassAsScala(jinner) // inner class is entered as a side-effect
+                                // no need to call enter explicitly
 
         pendingLoadActions = { () =>
 
@@ -1016,14 +1016,15 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
      *  @param jclazz  The Java class
      *  @return A Scala class symbol that wraps all reflection info of `jclazz`
      */
-    private def jclassAsScala(jclazz: jClass[_]): Symbol = jclassAsScala(jclazz, sOwner(jclazz))
+    private def jclassAsScala(jclazz: jClass[_]): ClassSymbol =
+      toScala(classCache, jclazz)(_ jclassAsScala1 _)
 
-    private def jclassAsScala(jclazz: jClass[_], owner: Symbol): ClassSymbol = {
+    private def jclassAsScala1(jclazz: jClass[_]): ClassSymbol = {
+      val owner = sOwner(jclazz)
       val name = scalaSimpleName(jclazz)
       val completer = (clazz: Symbol, module: Symbol) => new FromJavaClassCompleter(clazz, module, jclazz)
-      val (clazz, _) = createClassModule(owner, name, completer)
-      classCache enter (jclazz, clazz)
-      clazz
+
+      initAndEnterClassAndModule(owner, name, completer)._1
     }
 
     /**