Merge pull request #4488 from dotty-staging/fix-self-comparison

odersky · web-flow · commit 23184335ecb3 · 2018-05-09T12:21:25.000+02:00
Fix typo in SimpleIdentitySet
diff --git a/compiler/src/dotty/tools/dotc/util/SimpleIdentitySet.scala b/compiler/src/dotty/tools/dotc/util/SimpleIdentitySet.scala
@@ -59,7 +59,7 @@ object SimpleIdentitySet {
   private class Set3[+Elem <: AnyRef](x0: AnyRef, x1: AnyRef, x2: AnyRef) extends SimpleIdentitySet[Elem] {
     def size = 3
     def + [E >: Elem <: AnyRef](x: E): SimpleIdentitySet[E] =
-      if (contains(this)) this
+      if (contains(x)) this
       else {
         val xs = new Array[AnyRef](4)
         xs(0) = x0
@@ -113,4 +113,4 @@ object SimpleIdentitySet {
       while (i < size) { f(xs(i).asInstanceOf[Elem]); i += 1 }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ object SimpleIdentitySet {`
`59`	`59`	`private class Set3[+Elem <: AnyRef](x0: AnyRef, x1: AnyRef, x2: AnyRef) extends SimpleIdentitySet[Elem] {`
`60`	`60`	`def size = 3`
`61`	`61`	`def + [E >: Elem <: AnyRef](x: E): SimpleIdentitySet[E] =`
`62`		`- if (contains(this)) this`
	`62`	`+ if (contains(x)) this`
`63`	`63`	`else {`
`64`	`64`	`val xs = new Array[AnyRef](4)`
`65`	`65`	`xs(0) = x0`
`@@ -113,4 +113,4 @@ object SimpleIdentitySet {`
`113`	`113`	`while (i < size) { f(xs(i).asInstanceOf[Elem]); i += 1 }`
`114`	`114`	`}`
`115`	`115`	`}`
`116`		`-}`
	`116`	`+}`