diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-21 16:11:38 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-05-21 16:11:38 -0700 |
| commit | dcf6b0a97f083aa76fa80c605446c06b2821b84d (patch) | |
| tree | 124f9239ffcfb6cf5cc3480ce3f2d58600619e0e /src | |
| parent | 97543db610bcccdd0243091ba3bebc23061102e8 (diff) | |
| parent | aca8f96d1cf5f645c24eac11f695dadae08ea381 (diff) | |
| download | scala-dcf6b0a97f083aa76fa80c605446c06b2821b84d.tar.gz scala-dcf6b0a97f083aa76fa80c605446c06b2821b84d.tar.bz2 scala-dcf6b0a97f083aa76fa80c605446c06b2821b84d.zip | |
Merge pull request #4477 from retronym/ticket/9286
SI-9286 Check subclass privates for "same type after erasure"
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/Erasure.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index 9fdc3a9d72..a04625c9c5 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -814,11 +814,10 @@ abstract class Erasure extends AddInterfaces // specialized members have no type history before 'specialize', causing double def errors for curried defs override def exclude(sym: Symbol): Boolean = ( sym.isType - || sym.isPrivate || super.exclude(sym) || !sym.hasTypeAt(currentRun.refchecksPhase.id) ) - override def matches(lo: Symbol, high: Symbol) = true + override def matches(lo: Symbol, high: Symbol) = !high.isPrivate } def isErasureDoubleDef(pair: SymbolPair) = { import pair._ |