diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-04-22 08:36:11 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-04-22 08:36:11 +0200 |
| commit | 6863c5c390d59f4ccee4f1b877479128a8682820 (patch) | |
| tree | 6250c816c8a751dd8db0a92f137ce1856e39fca7 /src/compiler/scala/tools/nsc/backend/jvm | |
| parent | 7a24bd6bcde707e25b17e8e1f8dcdea21c51e17a (diff) | |
| parent | cce701650143d13c8b292bffd590bf7c8eb532d7 (diff) | |
| download | scala-6863c5c390d59f4ccee4f1b877479128a8682820.tar.gz scala-6863c5c390d59f4ccee4f1b877479128a8682820.tar.bz2 scala-6863c5c390d59f4ccee4f1b877479128a8682820.zip | |
Merge pull request #5110 from sjrd/remove-duplicate-implem-of-hashcodes
Remove the duplicate implem of hash codes for numbers.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/jvm')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/CoreBTypes.scala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala index fe08c4355d..22587c68f7 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala @@ -1089,7 +1089,6 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder { /* Generate the scala ## method. */ def genScalaHash(tree: Tree, applyPos: Position): BType = { - genLoadModule(ScalaRunTimeModule) // TODO why load ScalaRunTimeModule if ## has InvokeStyle of Static(false) ? genLoad(tree, ObjectRef) genCallMethod(hashMethodSym, InvokeStyle.Static, applyPos) } diff --git a/src/compiler/scala/tools/nsc/backend/jvm/CoreBTypes.scala b/src/compiler/scala/tools/nsc/backend/jvm/CoreBTypes.scala index 4d03f9851e..0b53ea2fb1 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/CoreBTypes.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/CoreBTypes.scala @@ -251,7 +251,7 @@ class CoreBTypes[BTFS <: BTypesFromSymbols[_ <: Global]](val bTypes: BTFS) { ) } - lazy val hashMethodSym: Symbol = getMember(ScalaRunTimeModule, nme.hash_) + lazy val hashMethodSym: Symbol = getMember(RuntimeStaticsModule, nme.anyHash) // TODO @lry avoiding going through through missingHook for every line in the REPL: https://github.com/scala/scala/commit/8d962ed4ddd310cc784121c426a2e3f56a112540 lazy val AndroidParcelableInterface : Symbol = getClassIfDefined("android.os.Parcelable") |