diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-12 16:58:44 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-08-19 17:53:32 +0200 |
commit | 53437e61305d656c115c94b25845c8f8dd7342ca (patch) | |
tree | 670c937346edb1588e66493de827a3d79affb5dc /src | |
parent | c3752d710eff34e348580bc093821a0a8170a325 (diff) | |
download | scala-53437e61305d656c115c94b25845c8f8dd7342ca.tar.gz scala-53437e61305d656c115c94b25845c8f8dd7342ca.tar.bz2 scala-53437e61305d656c115c94b25845c8f8dd7342ca.zip |
Minor cleanups, integrating review feedback
Review was in https://github.com/scala/scala/pull/3855
Diffstat (limited to 'src')
3 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala index 542ff48c33..05a2867a3a 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala @@ -949,7 +949,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder { def genCallMethod(method: Symbol, style: InvokeStyle, hostClass0: Symbol = null, pos: Position = NoPosition) { val siteSymbol = claszSymbol - val hostSymbol = if (hostClass0 == null) method.owner else hostClass0; + val hostSymbol = if (hostClass0 == null) method.owner else hostClass0 val methodOwner = method.owner // info calls so that types are up to date; erasure may add lateINTERFACE to traits hostSymbol.info ; methodOwner.info diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala index 5992a55ffa..c14997628f 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala @@ -330,12 +330,12 @@ abstract class BCodeHelpers extends BCodeIdiomatic with BytecodeWriters { getClassBTypeAndRegisterInnerClass(classSym).internalName } - @inline private def assertClassNotArray(sym: Symbol): Unit = { + private def assertClassNotArray(sym: Symbol): Unit = { assert(sym.isClass, sym) assert(sym != definitions.ArrayClass || isCompilingArray, sym) } - @inline private def assertClassNotArrayNotPrimitive(sym: Symbol): Unit = { + private def assertClassNotArrayNotPrimitive(sym: Symbol): Unit = { assertClassNotArray(sym) assert(!primitiveTypeMap.contains(sym) || isCompilingPrimitive, sym) } diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala b/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala index 783c9c56a1..3b11a484bb 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BTypesFromSymbols.scala @@ -24,8 +24,6 @@ class BTypesFromSymbols[G <: Global](val global: G) extends BTypes with CoreBTyp import global._ import definitions._ - import global.TypeName - def internalNameString(offset: Int, length: Int) = new String(global.chrs, offset, length) protected val classBTypeFromInternalNameMap = { |