Merge remote tracking branch 'origin/2.10.x' into topic/merge-2.10.x-to-v2.11.0-M2-74-g00e6c8b

Conflicts:
    bincompat-backward.whitelist.conf
    bincompat-forward.whitelist.conf
    build.xml
    src/compiler/scala/reflect/reify/utils/Extractors.scala
    src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
    src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
    src/compiler/scala/tools/nsc/transform/patmat/MatchOptimization.scala
    src/compiler/scala/tools/nsc/typechecker/Typers.scala
    src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
    src/reflect/scala/reflect/internal/Types.scala
    src/reflect/scala/reflect/runtime/JavaUniverse.scala
    test/files/run/inline-ex-handlers.check
    test/files/run/t6223.check
    test/files/run/t6223.scala
    test/scaladoc/scalacheck/IndexTest.scala

1 files changed, 71 insertions, 0 deletions

diff --git a/test/files/run/t7242.scala b/test/files/run/t7242.scala
new file mode 100644
index 0000000000..c995336144
--- /dev/null
+++ b/test/files/run/t7242.scala
@@ -0,0 +1,71 @@
+class CrashTest {
+  def foo = ()
+  trait CrashTestTable {
+    def cols = foo
+  }
+  // This was leading to a class between the mixed in
+  // outer accessor and the outer accessor of this object.
+  object CrashTestTable extends CrashTestTable {
+    foo
+    cols
+  }
+}
+
+class CrashTest1 {
+  def foo = ()
+  class CrashTestTable {
+    def cols = foo
+  }
+  object CrashTestTable extends CrashTestTable {
+    foo
+    cols
+  }
+}
+
+class CrashTest2 {
+  def foo = ()
+  trait CrashTestTable {
+    def cols = foo
+  }
+  object Obj extends CrashTestTable {
+    foo
+    cols
+  }
+}
+
+class CrashTest3 {
+  def foo = ()
+
+  def meth() {
+    trait CrashTestTable {
+      def cols = foo
+    }
+    object Obj extends CrashTestTable {
+      foo
+      cols
+    }
+    Obj
+  }
+}
+
+object Test extends App {
+  {
+    val c = new CrashTest
+    c.CrashTestTable
+  }
+
+  {
+    val c = new CrashTest1
+    c.CrashTestTable
+  }
+
+  {
+    val c = new CrashTest2
+    c.Obj
+  }
+
+  {
+    val c = new CrashTest3
+    c.meth()
+  }
+}