Skip to content

Commit 217bdcd

Browse files
committed
Avoid duplicate hashCode/equals
1 parent 3b096f6 commit 217bdcd

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

compiler/src/dotty/tools/dotc/core/Names.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ object Names {
105105
def lastIndexOfSlice(str: String): Int = lastPart.toString.lastIndexOfSlice(str)
106106
def lastIndexOfSlice(name: Name): Int = lastIndexOfSlice(name.toString)
107107

108+
override def hashCode = System.identityHashCode(this)
108109
override def equals(that: Any) = this eq that.asInstanceOf[AnyRef]
109110
}
110111

@@ -196,9 +197,6 @@ object Names {
196197
thisKind == kind ||
197198
!thisKind.definesNewName && thisKind.tag > kind.tag && underlying.is(kind)
198199
}
199-
200-
override def hashCode = System.identityHashCode(this)
201-
override def equals(other: Any) = this eq other.asInstanceOf[AnyRef]
202200
}
203201

204202
class SimpleTermName(val start: Int, val length: Int, @sharable private[Names] var next: SimpleTermName) extends TermName {

compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ object TastyFormat {
222222
final val UTF8 = 1
223223
final val QUALIFIED = 2
224224
final val FLATTENED = 3
225-
final val EXPANDPREFIX = 5
226225
final val EXPANDED = 4
226+
final val EXPANDPREFIX = 5
227227
final val TRAITSETTER = 6
228228
final val UNIQUE = 10
229229
final val DEFAULTGETTER = 11

compiler/src/dotty/tools/dotc/transform/TreeChecker.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,8 @@ class TreeChecker extends Phase with SymTransformer {
403403
override def typedDefDef(ddef: untpd.DefDef, sym: Symbol)(implicit ctx: Context) =
404404
withDefinedSyms(ddef.tparams) {
405405
withDefinedSymss(ddef.vparamss) {
406-
if (!sym.isClassConstructor && !(sym.name eq Names.STATIC_CONSTRUCTOR)) assert(isValidJVMMethodName(sym.name), s"${sym.fullName} name is invalid on jvm")
406+
if (!sym.isClassConstructor && !(sym.name eq Names.STATIC_CONSTRUCTOR))
407+
assert(isValidJVMMethodName(sym.name), s"${sym.name.debugString} name is invalid on jvm")
407408

408409
ddef.vparamss.foreach(_.foreach { vparam =>
409410
assert(vparam.symbol.is(Param),

0 commit comments

Comments
 (0)