Skip to content

Commit

Permalink
Avoid needless Name creation
Browse files Browse the repository at this point in the history
 - Don't create names just to perform prefix/suffix checks
 - Don't create names, decode, *and* intern strings in ICode
  • Loading branch information
retronym committed Jan 31, 2014
1 parent e3af86a commit 811e423
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 15 deletions.
8 changes: 4 additions & 4 deletions src/compiler/scala/tools/nsc/backend/icode/Members.scala
Expand Up @@ -21,16 +21,16 @@ trait Members {

import global._

object NoCode extends Code(null, "NoCode") {
object NoCode extends Code(null, TermName("NoCode")) {
override def blocksList: List[BasicBlock] = Nil
}

/**
* This class represents the intermediate code of a method or
* other multi-block piece of code, like exception handlers.
*/
class Code(method: IMethod, name: String) {
def this(method: IMethod) = this(method, method.symbol.decodedName.toString.intern)
class Code(method: IMethod, name: Name) {
def this(method: IMethod) = this(method, method.symbol.name)
/** The set of all blocks */
val blocks = mutable.ListBuffer[BasicBlock]()

Expand Down Expand Up @@ -82,7 +82,7 @@ trait Members {
}

/** This methods returns a string representation of the ICode */
override def toString = "ICode '" + name + "'"
override def toString = "ICode '" + name.decoded + "'"

/* Compute a unique new label */
def nextLabel: Int = {
Expand Down
35 changes: 25 additions & 10 deletions src/reflect/scala/reflect/internal/Names.scala
Expand Up @@ -345,6 +345,13 @@ trait Names extends api.Names {
i += 1
i == prefix.length
}
final def startsWith(prefix: String, start: Int): Boolean = {
var i = 0
while (i < prefix.length && start + i < len &&
chrs(index + start + i) == prefix.charAt(i))
i += 1
i == prefix.length
}

/** Does this name end with suffix? */
final def endsWith(suffix: Name): Boolean = endsWith(suffix, len)
Expand All @@ -357,6 +364,13 @@ trait Names extends api.Names {
i += 1
i > suffix.length
}
final def endsWith(suffix: String, end: Int): Boolean = {
var i = 1
while (i <= suffix.length && i <= end &&
chrs(index + end - i) == suffix.charAt(suffix.length - i))
i += 1
i > suffix.length
}

final def containsName(subname: String): Boolean = containsName(newTermName(subname))
final def containsName(subname: Name): Boolean = {
Expand All @@ -382,9 +396,9 @@ trait Names extends api.Names {
final def startChar: Char = this charAt 0
final def endChar: Char = this charAt len - 1
final def startsWith(char: Char): Boolean = len > 0 && startChar == char
final def startsWith(name: String): Boolean = startsWith(newTermName(name))
final def startsWith(name: String): Boolean = startsWith(name, 0)
final def endsWith(char: Char): Boolean = len > 0 && endChar == char
final def endsWith(name: String): Boolean = endsWith(newTermName(name))
final def endsWith(name: String): Boolean = endsWith(name, len)

/** Rewrite the confusing failure indication via result == length to
* the normal failure indication via result == -1.
Expand Down Expand Up @@ -443,9 +457,10 @@ trait Names extends api.Names {
}

/** TODO - find some efficiency. */
def append(ch: Char) = newName("" + this + ch)
def append(suffix: String) = newName("" + this + suffix)
def append(suffix: Name) = newName("" + this + suffix)
def append(ch: Char) = newName(toString + ch)
def append(suffix: String) = newName(toString + suffix)
def append(suffix: Name) = newName(toString + suffix)
def append(separator: Char, suffix: Name) = newName(toString + separator + suffix)
def prepend(prefix: String) = newName("" + prefix + this)

def decodedName: ThisNameType = newName(decode)
Expand All @@ -463,7 +478,7 @@ trait Names extends api.Names {
*/
final class NameOps[T <: Name](name: T) {
import NameTransformer._
def stripSuffix(suffix: String): T = stripSuffix(suffix: TermName)
def stripSuffix(suffix: String): T = if (name endsWith suffix) dropRight(suffix.length) else name // OPT avoid creating a Name with `suffix`
def stripSuffix(suffix: Name): T = if (name endsWith suffix) dropRight(suffix.length) else name
def take(n: Int): T = name.subName(0, n).asInstanceOf[T]
def drop(n: Int): T = name.subName(n, name.length).asInstanceOf[T]
Expand Down Expand Up @@ -500,21 +515,21 @@ trait Names extends api.Names {
/** TermName_S and TypeName_S have fields containing the string version of the name.
* TermName_R and TypeName_R recreate it each time toString is called.
*/
private class TermName_S(index0: Int, len0: Int, hash: Int, override val toString: String) extends TermName(index0, len0, hash) {
private final class TermName_S(index0: Int, len0: Int, hash: Int, override val toString: String) extends TermName(index0, len0, hash) {
protected def createCompanionName(h: Int): TypeName = new TypeName_S(index, len, h, toString)
override def newName(str: String): TermName = newTermNameCached(str)
}
private class TypeName_S(index0: Int, len0: Int, hash: Int, override val toString: String) extends TypeName(index0, len0, hash) {
private final class TypeName_S(index0: Int, len0: Int, hash: Int, override val toString: String) extends TypeName(index0, len0, hash) {
protected def createCompanionName(h: Int): TermName = new TermName_S(index, len, h, toString)
override def newName(str: String): TypeName = newTypeNameCached(str)
}

private class TermName_R(index0: Int, len0: Int, hash: Int) extends TermName(index0, len0, hash) {
private final class TermName_R(index0: Int, len0: Int, hash: Int) extends TermName(index0, len0, hash) {
protected def createCompanionName(h: Int): TypeName = new TypeName_R(index, len, h)
override def toString = new String(chrs, index, len)
}

private class TypeName_R(index0: Int, len0: Int, hash: Int) extends TypeName(index0, len0, hash) {
private final class TypeName_R(index0: Int, len0: Int, hash: Int) extends TypeName(index0, len0, hash) {
protected def createCompanionName(h: Int): TermName = new TermName_R(index, len, h)
override def toString = new String(chrs, index, len)
}
Expand Down
2 changes: 1 addition & 1 deletion src/reflect/scala/reflect/internal/Symbols.scala
Expand Up @@ -1102,7 +1102,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
private def fullNameInternal(separator: Char): Name = (
if (isRoot || isRootPackage || this == NoSymbol) name
else if (owner.isEffectiveRoot) name
else ((effectiveOwner.enclClass.fullNameAsName(separator) append separator): Name) append name
else effectiveOwner.enclClass.fullNameAsName(separator) append (separator, name)
)

def fullNameAsName(separator: Char): Name = fullNameInternal(separator).dropLocal
Expand Down

0 comments on commit 811e423

Please sign in to comment.