Skip to content

Commit 06a77e7

Browse files
Remove backend "compatibility layer"
1 parent 6585bb2 commit 06a77e7

File tree

8 files changed

+10
-48
lines changed

8 files changed

+10
-48
lines changed

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import java.io.{File => _}
1111
import scala.collection.generic.Clearable
1212
import scala.collection.mutable
1313
import scala.reflect.ClassTag
14-
import scala.reflect.internal.util.WeakHashSet
14+
import dotty.tools.dotc.util.WeakHashSet
1515
import dotty.tools.io.AbstractFile
1616
import scala.tools.asm.AnnotationVisitor
1717
import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
105105
/* ---------------- q2 ---------------- */
106106

107107
case class SubItem2(classNode: asm.tree.ClassNode,
108-
file: scala.tools.nsc.io.AbstractFile)
108+
file: dotty.tools.io.AbstractFile)
109109

110110
case class Item2(arrivalPos: Int,
111111
mirror: SubItem2,
@@ -128,7 +128,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
128128
case class SubItem3(
129129
jclassName: String,
130130
jclassBytes: Array[Byte],
131-
jclassFile: scala.tools.nsc.io.AbstractFile
131+
jclassFile: dotty.tools.io.AbstractFile
132132
)
133133

134134
case class Item3(arrivalPos: Int,

compiler/src/scala/reflect/internal/pickling/package.scala

Lines changed: 0 additions & 8 deletions
This file was deleted.

compiler/src/scala/reflect/internal/util/package.scala

Lines changed: 0 additions & 5 deletions
This file was deleted.

compiler/src/scala/tools/nsc/backend/jvm/BCodeHelpers.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package backend.jvm
99

1010
import scala.tools.asm
1111
import scala.collection.mutable
12-
import scala.tools.nsc.io.AbstractFile
12+
import dotty.tools.io.AbstractFile
1313

1414
/*
1515
* Traits encapsulating functionality to convert Scala AST Trees into ASM ClassNodes.
@@ -41,7 +41,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
4141
/*
4242
* must-single-thread
4343
*/
44-
def getOutFolder(csym: Symbol, cName: String): _root_.scala.tools.nsc.io.AbstractFile = {
44+
def getOutFolder(csym: Symbol, cName: String): AbstractFile = {
4545
try {
4646
csym.outputDirectory
4747
} catch {
@@ -145,7 +145,7 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
145145
*/
146146
trait BCPickles {
147147

148-
import scala.reflect.internal.pickling.{ PickleFormat, PickleBuffer }
148+
import dotty.tools.dotc.core.unpickleScala2.{ PickleFormat, PickleBuffer }
149149

150150
val versionPickle = {
151151
val vp = new PickleBuffer(new Array[Byte](16), -1, 0)

compiler/src/scala/tools/nsc/backend/jvm/BackendInterface.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package scala.tools.nsc.backend.jvm
22

33
import scala.collection.generic.Clearable
44
import scala.reflect.ClassTag
5-
import scala.tools.nsc.io.AbstractFile
5+
import dotty.tools.io.AbstractFile
66
import scala.language.implicitConversions
77
import scala.tools.asm
88

@@ -657,7 +657,7 @@ abstract class BackendInterface extends BackendInterfaceDefinitions {
657657
def newWeakMap[K, V](): collection.mutable.WeakHashMap[K, V]
658658
def newMap[K, V](): collection.mutable.HashMap[K, V]
659659
def newSet[K](): collection.mutable.Set[K]
660-
def newWeakSet[K >: Null <: AnyRef](): reflect.internal.util.WeakHashSet[K]
660+
def newWeakSet[K >: Null <: AnyRef](): dotty.tools.dotc.util.WeakHashSet[K]
661661
def newAnyRefMap[K <: AnyRef, V](): collection.mutable.AnyRefMap[K, V]
662662
}
663663

compiler/src/scala/tools/nsc/backend/jvm/BytecodeWriters.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package scala.tools.nsc
77
package backend.jvm
88

99
import java.io.{ DataOutputStream, FileOutputStream, IOException, OutputStream, File => JFile }
10-
import scala.tools.nsc.io._
10+
import dotty.tools.io._
1111
import java.util.jar.Attributes.Name
1212
import scala.language.postfixOps
1313

@@ -85,7 +85,7 @@ trait BytecodeWriters {
8585

8686
private val baseDir = Directory(int.emitAsmp.get).createDirectory()
8787

88-
private def emitAsmp(jclassBytes: Array[Byte], asmpFile: io.File): Unit = {
88+
private def emitAsmp(jclassBytes: Array[Byte], asmpFile: dotty.tools.io.File): Unit = {
8989
val pw = asmpFile.printWriter()
9090
try {
9191
val cnode = new asm.tree.ClassNode()

compiler/src/scala/tools/nsc/io/package.scala

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)