Merge pull request #3634 from retronym/ticket/7992

SI-7992 Fix super-accessor generation after a local class

3 files changed, 40 insertions, 0 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 87da565142..9b9e641cad 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -346,12 +346,14 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
      *  performance hit for the compiler as a whole.
      */
     override def atOwner[A](tree: Tree, owner: Symbol)(trans: => A): A = {
+      val savedValid = validCurrentOwner
       if (owner.isClass) validCurrentOwner = true
       val savedLocalTyper = localTyper
       localTyper = localTyper.atOwner(tree, if (owner.isModule) owner.moduleClass else owner)
       typers = typers updated (owner, localTyper)
       val result = super.atOwner(tree, owner)(trans)
       localTyper = savedLocalTyper
+      validCurrentOwner = savedValid
       typers -= owner
       result
     }
diff --git a/test/files/run/t7992.scala b/test/files/run/t7992.scala
new file mode 100644
index 0000000000..fde231b961
--- /dev/null
+++ b/test/files/run/t7992.scala
@@ -0,0 +1,20 @@
+class C {
+  def foo: Int = 0
+}
+
+class D extends C {
+  override def foo: Int = {
+    val f = () => {
+      class C     // comment this line to fix.
+      D.super.foo // no super accessor generated here!
+      // java.lang.VerifyError: (class: D$$anonfun$1, method: apply$mcI$sp signature: ()I) Illegal use of nonvirtual function call
+    }
+    f()
+  }
+}
+
+object Test {
+  def main(args: Array[String]) {
+    new D().foo
+  }
+}
diff --git a/test/files/run/t7992b.scala b/test/files/run/t7992b.scala
new file mode 100644
index 0000000000..6fe1f990d5
--- /dev/null
+++ b/test/files/run/t7992b.scala
@@ -0,0 +1,18 @@
+class C {
+  def foo: Int = 0
+}
+
+class E extends C {
+  override def foo: Int = {
+    (None: Option[Int]).getOrElse {
+      class C
+      E.super.foo 
+    }
+  }
+}
+
+object Test {
+  def main(args: Array[String]) {
+    new E().foo
+  }
+}