summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2015-06-29 13:59:46 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-06-29 13:59:46 -0700
commit12f92b7f0566a9557dbb8d73bba21b72764eed68 (patch)
tree7a7a5325db9ea4a3386b1e76520714568e19d2e8 /src/compiler
parent21387d61ec8935e684ca934afa5fc9ba89199da0 (diff)
parentb17a291c2edf28aca1713aa4a30d8bba3886bc8d (diff)
downloadscala-12f92b7f0566a9557dbb8d73bba21b72764eed68.tar.gz
scala-12f92b7f0566a9557dbb8d73bba21b72764eed68.tar.bz2
scala-12f92b7f0566a9557dbb8d73bba21b72764eed68.zip
Merge pull request #4588 from retronym/topic/icodish
GenBCode: fix incrementatal compilation by mimicing GenASM
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/backend/jvm/GenBCode.scala5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenBCode.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenBCode.scala
index 455117d837..af962c4ce0 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenBCode.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenBCode.scala
@@ -167,6 +167,11 @@ abstract class GenBCode extends BCodeSyncAndTry {
)
}
+ // shim for SBT, see https://github.com/sbt/sbt/issues/2076
+ // TODO put this closer to classfile writing once we have closure elimination
+ // TODO create a nicer public API to find out the correspondence between sourcefile and ultimate classfiles
+ currentUnit.icode += new icodes.IClass(cd.symbol)
+
// -------------- mirror class, if needed --------------
val mirrorC =
if (isTopLevelModuleClass(claszSymbol)) {