summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Typers.scala
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2015-07-23 13:52:11 +0200
committerLukas Rytz <lukas.rytz@typesafe.com>2015-07-23 13:52:11 +0200
commit823fb0ffb256590305a44897acfa80bb99f6d19b (patch)
tree9e584cda7434fd280256a744950f27197079b07c /src/compiler/scala/tools/nsc/typechecker/Typers.scala
parente1f7cca3379d4ee9ba8be7e9e6b1cd88cd1913ed (diff)
parent93bee55e68522a46e501229dd0d5f2af4b72ac4a (diff)
downloadscala-823fb0ffb256590305a44897acfa80bb99f6d19b.tar.gz
scala-823fb0ffb256590305a44897acfa80bb99f6d19b.tar.bz2
scala-823fb0ffb256590305a44897acfa80bb99f6d19b.zip
Merge pull request #4652 from retronym/ticket/9408
SI-9408 Avoid capturing outer class in local classes.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 777ff388b6..cc15a2485f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1694,6 +1694,8 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
psym addChild context.owner
else
pending += ParentSealedInheritanceError(parent, psym)
+ if (psym.isLocalToBlock && !phase.erasedTypes)
+ psym addChild context.owner
val parentTypeOfThis = parent.tpe.dealias.typeOfThis
if (!(selfType <:< parentTypeOfThis) &&