summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-12-05 11:52:53 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-12-05 11:52:53 -0800
commit881048933667dc3e021d557e9f79e0850ac84712 (patch)
treeda2c93e5469ed86e50b3fe6ba5e9ddea1e27337d /src/compiler/scala/tools/nsc/typechecker/Contexts.scala
parentcbbfbffc44a93c2a62565fdfb60d7b587d5edd1e (diff)
parent64ae23f6438054a08bebf1fa6af0f14d63cfc0ea (diff)
downloadscala-881048933667dc3e021d557e9f79e0850ac84712.tar.gz
scala-881048933667dc3e021d557e9f79e0850ac84712.tar.bz2
scala-881048933667dc3e021d557e9f79e0850ac84712.zip
Merge pull request #4169 from retronym/ticket/9008
SI-9008 Fix regression with higher kinded existentials
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Contexts.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Contexts.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
index 8c2bc316ec..a7d0d32c6f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Contexts.scala
@@ -480,7 +480,8 @@ trait Contexts { self: Analyzer =>
// SI-8245 `isLazy` need to skip lazy getters to ensure `return` binds to the right place
c.enclMethod = if (isDefDef && !owner.isLazy) c else enclMethod
- if (tree != outer.tree) c(TypeConstructorAllowed) = false
+ if (tree != outer.tree)
+ c(TypeConstructorAllowed) = false
registerContext(c.asInstanceOf[analyzer.Context])
debuglog("[context] ++ " + c.unit + " / " + tree.summaryString)