diff options
| author | Paul Phillips <paulp@improving.org> | 2012-11-14 12:22:22 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-11-14 12:28:17 -0800 |
| commit | 823d77947e7f6502905cfbafee396fad0a908ede (patch) | |
| tree | da3704bcf072038f14203e7daeaceb5193870eed /src/compiler/scala/tools/nsc/typechecker/Namers.scala | |
| parent | ed6520b4fa002ea143cead5eb3633839d500e08d (diff) | |
| download | scala-823d77947e7f6502905cfbafee396fad0a908ede.tar.gz scala-823d77947e7f6502905cfbafee396fad0a908ede.tar.bz2 scala-823d77947e7f6502905cfbafee396fad0a908ede.zip | |
Fix for SI-6357, cycle with value classes.
Don't force the owner info.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Namers.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 3f5410eb45..da2282c1dd 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -1316,7 +1316,8 @@ trait Namers extends MethodSynthesis { if (clazz.isDerivedValueClass) { log("Ensuring companion for derived value class " + name + " at " + cdef.pos.show) clazz setFlag FINAL - enclosingNamerWithScope(clazz.owner.info.decls).ensureCompanionObject(cdef) + // Don't force the owner's info lest we create cycles as in SI-6357. + enclosingNamerWithScope(clazz.owner.rawInfo.decls).ensureCompanionObject(cdef) } result |