diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Fields.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t9918/package.scala | 1 | ||||
| -rw-r--r-- | test/files/pos/t9918/t9918.scala | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Fields.scala b/src/compiler/scala/tools/nsc/transform/Fields.scala index a383b65192..10494f33d1 100644 --- a/src/compiler/scala/tools/nsc/transform/Fields.scala +++ b/src/compiler/scala/tools/nsc/transform/Fields.scala @@ -721,7 +721,7 @@ abstract class Fields extends InfoTransform with ast.TreeDSL with TypingTransfor override def transformStats(stats: List[Tree], exprOwner: Symbol): List[Tree] = { val addedStats = - if (!currentOwner.isClass) Nil // TODO: || currentOwner.isPackageClass + if (!currentOwner.isClass || currentOwner.isPackageClass) Nil else afterOwnPhase { fieldsAndAccessors(currentOwner) } val inRealClass = currentOwner.isClass && !(currentOwner.isPackageClass || currentOwner.isTrait) diff --git a/test/files/pos/t9918/package.scala b/test/files/pos/t9918/package.scala new file mode 100644 index 0000000000..9bd8ac9a69 --- /dev/null +++ b/test/files/pos/t9918/package.scala @@ -0,0 +1 @@ +package object pkg extends T diff --git a/test/files/pos/t9918/t9918.scala b/test/files/pos/t9918/t9918.scala new file mode 100644 index 0000000000..ec9a146579 --- /dev/null +++ b/test/files/pos/t9918/t9918.scala @@ -0,0 +1,3 @@ +package pkg + +trait T { object O } |