Merge pull request #1203 from lampepfl/DarkDimius-patch-5

odersky · odersky · commit 8dff0c6e2512 · 2016-04-06T11:21:56.000+02:00
Two fixes to TermRefWithSignature.newLikeThis
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala
@@ -1743,7 +1743,7 @@ object Types {
       if (symbol.exists && !candidate.symbol.exists) { // recompute from previous symbol
         val ownSym = symbol
         val newd = asMemberOf(prefix)
-        candidate.withDenot(asMemberOf(prefix).suchThat(_ eq ownSym))
+        candidate.withDenot(newd.suchThat(_.signature == ownSym.signature))
       }
       else candidate
     }

Original file line number	Diff line number	Diff line change
`@@ -1743,7 +1743,7 @@ object Types {`
`1743`	`1743`	`if (symbol.exists && !candidate.symbol.exists) { // recompute from previous symbol`
`1744`	`1744`	`val ownSym = symbol`
`1745`	`1745`	`val newd = asMemberOf(prefix)`
`1746`		`- candidate.withDenot(asMemberOf(prefix).suchThat(_ eq ownSym))`
	`1746`	`+ candidate.withDenot(newd.suchThat(_.signature == ownSym.signature))`
`1747`	`1747`	`}`
`1748`	`1748`	`else candidate`
`1749`	`1749`	`}`