Skip to content

Commit 78aa682

Browse files
committed
Revert "Fix #580: use isContainedIn to support cases where the enclosing class is also the top-level class"
This reverts commit 6898d2c.
1 parent 7bc7c9b commit 78aa682

File tree

3 files changed

+1
-27
lines changed

3 files changed

+1
-27
lines changed

src/dotty/tools/dotc/transform/LambdaLift.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
292292
val encClass = local.enclosingClass
293293
val topClass = local.topLevelClass
294294
// member of a static object
295-
if (encClass.isStatic && encClass.isContainedIn(topClass)) {
295+
if (encClass.isStatic && encClass.isProperlyContainedIn(topClass)) {
296296
// though the second condition seems weird, it's not true for symbols which are defined in some
297297
// weird combinations of super calls.
298298
(encClass, EmptyFlags)

tests/run/innerInObject.check

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/run/innerInObject.scala

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)