forked from scala/scala
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GenBCode: fix incrementatal compilation by mimicing GenASM
The incremental compiler in SBT uses an implementation detail of the compiler backend to enumerate the classes that are actually written to disk. This commit mimics this in GenBCode by populating `Run#icode` with an `IClass` for each `ClassDef` processed. We should revisit this by creating a dedicated API for this purpose and migrating SBT to use that. We should also revisit this code as we implement closure elimination in the GenBCode; this commit assumes that all `ClassDef`s that enter the backend will generate classfile products. The enclosed test is extracted from the incrementatl compiler. I've also manually integration tested this with SBT: https://gist.github.com/retronym/fabf6f92787ea9c1ce67
- Loading branch information
Showing
2 changed files
with
47 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import scala.tools.partest._ | ||
import scala.tools.nsc._ | ||
|
||
object Test extends DirectTest { | ||
|
||
def code = """ | ||
class C { class D } | ||
object O | ||
""".trim | ||
|
||
def show() { | ||
for (b <- List("GenASM", "GenBCode")) { | ||
val global = newCompiler("-usejavacp", s"-Ybackend:$b") | ||
import global._ | ||
val r = new Run | ||
r.compileSources(newSourceFile(code) :: Nil) | ||
|
||
val results = collection.mutable.Buffer[(Boolean, String)]() | ||
|
||
// Nailing down defacto compiler API from SBT's usage | ||
// https://github.com/sbt/sbt/blob/adb41611cf73260938274915d8462d924df200c8/compile/interface/src/main/scala/xsbt/Analyzer.scala#L29-L41 | ||
def isTopLevelModule(sym: Symbol) = sym.isTopLevel && sym.isModule | ||
for (unit <- currentRun.units if !unit.isJava) { | ||
val sourceFile = unit.source.file.file | ||
for (iclass <- unit.icode) { | ||
val sym = iclass.symbol | ||
def addGenerated(separatorRequired: Boolean) { | ||
results += (separatorRequired -> sym.fullName) | ||
} | ||
if (sym.isModuleClass && !sym.isImplClass) { | ||
if (isTopLevelModule(sym) && sym.companionClass == NoSymbol) | ||
addGenerated(false) | ||
addGenerated(true) | ||
} else | ||
addGenerated(false) | ||
} | ||
} | ||
val expected = List((false, "C"), (true, "O"), (false, "C$D")) | ||
assert(results.toList == expected, b + ": " + results.toList) | ||
} | ||
} | ||
} |