Skip to content

Faster base class sets #2676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions compiler/src/dotty/tools/dotc/core/SymDenotations.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1400,14 +1400,14 @@ object SymDenotations {
baseData._2

def computeBaseData(implicit onBehalf: BaseData, ctx: Context): (List[ClassSymbol], BaseClassSet) = {
val seen = mutable.SortedSet[Int]()
val seen = new BaseClassSetBuilder
def addBaseClasses(bcs: List[ClassSymbol], to: List[ClassSymbol])
: List[ClassSymbol] = bcs match {
case bc :: bcs1 =>
val bcs1added = addBaseClasses(bcs1, to)
if (seen contains bc.id) bcs1added
if (seen contains bc) bcs1added
else {
seen += bc.id
seen.add(bc)
bc :: bcs1added
}
case nil =>
Expand All @@ -1425,7 +1425,7 @@ object SymDenotations {
if (classParents.isEmpty && !emptyParentsExpected)
onBehalf.signalProvisional()
(classSymbol :: addParentBaseClasses(classParents, Nil),
new BaseClassSet(seen.toArray))
seen.result)
}

final override def derivesFrom(base: Symbol)(implicit ctx: Context): Boolean =
Expand Down Expand Up @@ -2073,17 +2073,44 @@ object SymDenotations {
}

class BaseClassSet(val classIds: Array[Int]) extends AnyVal {
def contains(sym: Symbol): Boolean = {
def contains(sym: Symbol, limit: Int) = {
val id = sym.id
var lo = 0
var hi = classIds.length - 1
while (lo <= hi) {
val mid = (lo + hi) / 2
if (id < classIds(mid)) hi = mid - 1
else if (id > classIds(mid)) lo = mid + 1
else return true
var i = 0
while (i < limit && classIds(i) != id) i += 1
i < limit && {
if (i > 0) {
val t = classIds(i)
classIds(i) = classIds(i - 1)
classIds(i - 1) = t
}
true
}
false
}
def contains(sym: Symbol): Boolean = contains(sym, classIds.length)
}

private class BaseClassSetBuilder {
private var classIds = new Array[Int](32)
private var length = 0

private def resize(size: Int) = {
val classIds1 = new Array[Int](size)
Array.copy(classIds, 0, classIds1, 0, classIds.length min size)
classIds = classIds1
}

def contains(sym: Symbol): Boolean =
new BaseClassSet(classIds).contains(sym, length)

def add(sym: Symbol): Unit = {
if (length == classIds.length) resize(length * 2)
classIds(length) = sym.id
length += 1
}

def result = {
if (length != classIds.length) resize(length)
new BaseClassSet(classIds)
}
}

Expand Down