diff options
Diffstat (limited to 'src/compiler/scala')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala index bac84a4959..0b07e12917 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala @@ -297,14 +297,14 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder { case app : Apply => generatedType = genApply(app, expectedType) - case app @ ApplyDynamic(qual, Literal(Constant(boostrapMethodRef: Symbol)) :: staticAndDynamicArgs) => - val numStaticArgs = boostrapMethodRef.paramss.head.size - 3 /*JVM provided args*/ + case app @ ApplyDynamic(qual, Literal(Constant(bootstrapMethodRef: Symbol)) :: staticAndDynamicArgs) => + val numStaticArgs = bootstrapMethodRef.paramss.head.size - 3 /*JVM provided args*/ val (staticArgs, dynamicArgs) = staticAndDynamicArgs.splitAt(numStaticArgs) - val boostrapDescriptor = staticHandleFromSymbol(boostrapMethodRef) + val bootstrapDescriptor = staticHandleFromSymbol(bootstrapMethodRef) val bootstrapArgs = staticArgs.map({case t @ Literal(c: Constant) => bootstrapMethodArg(c, t.pos)}) val descriptor = methodBTypeFromMethodType(qual.symbol.info, false) genLoadArguments(dynamicArgs, qual.symbol.info.params.map(param => typeToBType(param.info))) - mnode.visitInvokeDynamicInsn(qual.symbol.name.encoded, descriptor.descriptor, boostrapDescriptor, bootstrapArgs : _*) + mnode.visitInvokeDynamicInsn(qual.symbol.name.encoded, descriptor.descriptor, bootstrapDescriptor, bootstrapArgs : _*) case ApplyDynamic(qual, args) => sys.error("No invokedynamic support yet.") @@ -613,7 +613,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder { } argsSize match { case 1 => bc newarray elemKind - case _ => // this is currently dead code is Scalac, unlike in Dotty + case _ => // this is currently dead code in Scalac, unlike in Dotty val descr = ("[" * argsSize) + elemKind.descriptor // denotes the same as: arrayN(elemKind, argsSize).descriptor mnode.visitMultiANewArrayInsn(descr, argsSize) } diff --git a/src/compiler/scala/tools/nsc/backend/jvm/opt/CallGraph.scala b/src/compiler/scala/tools/nsc/backend/jvm/opt/CallGraph.scala index b088b5ee48..e0fd77bb54 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/opt/CallGraph.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/opt/CallGraph.scala @@ -27,7 +27,7 @@ class CallGraph[BT <: BTypes](val btypes: BT) { * * Indexing the call graph by the containing MethodNode and the invocation MethodInsnNode allows * finding callsites efficiently. For example, an inlining heuristic might want to know all - * callsites withing a callee method. + * callsites within a callee method. * * Note that the call graph is not guaranteed to be complete: callsites may be missing. In * particular, if a method is very large, all of its callsites might not be in the hash map. diff --git a/src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala b/src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala index fedacdac41..65d1e20d69 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/opt/LocalOpt.scala @@ -47,7 +47,7 @@ import scala.tools.nsc.backend.jvm.opt.BytecodeUtils._ * note that eliminating empty handlers and stale local variable descriptors is required for * correctness, see the comment in the body of `methodOptimizations`. * - * box-unbox elimination (eliminates box-unbox pairs withing the same method) + * box-unbox elimination (eliminates box-unbox pairs within the same method) * + enables UPSTREAM: * - nullness optimizations (a box extraction operation (unknown nullness) may be rewritten to * a read of a non-null local. example in doc comment of box-unbox implementation) diff --git a/src/compiler/scala/tools/nsc/transform/Erasure.scala b/src/compiler/scala/tools/nsc/transform/Erasure.scala index cc234eb623..25475515aa 100644 --- a/src/compiler/scala/tools/nsc/transform/Erasure.scala +++ b/src/compiler/scala/tools/nsc/transform/Erasure.scala @@ -1093,7 +1093,7 @@ abstract class Erasure extends InfoTransform // See SI-5568. tree setSymbol Object_getClass } else { - devWarning(s"The symbol '${fn.symbol}' was interecepted but didn't match any cases, that means the intercepted methods set doesn't match the code") + devWarning(s"The symbol '${fn.symbol}' was intercepted but didn't match any cases, that means the intercepted methods set doesn't match the code") tree } } else qual match { @@ -1209,7 +1209,7 @@ abstract class Erasure extends InfoTransform try super.transform(tree1).clearType() finally tpt setType specialErasure(tree1.symbol)(tree1.symbol.tpe).resultType - case ApplyDynamic(qual, Literal(Constant(boostrapMethodRef: Symbol)) :: _) => + case ApplyDynamic(qual, Literal(Constant(bootstrapMethodRef: Symbol)) :: _) => tree case _ => super.transform(tree1).clearType() |