Skip to content

Commit 0cabe6f

Browse files
committed
Move fields
1 parent e3d1d96 commit 0cabe6f

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
4444
import coreBTypes._
4545
import int._
4646

47+
def ScalaATTRName: String = "Scala"
48+
def ScalaSignatureATTRName: String = "ScalaSig"
49+
50+
4751
val bCodeAsmCommon: BCodeAsmCommon[int.type] = new BCodeAsmCommon(int)
4852
import bCodeAsmCommon._
4953

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ trait BCodeSkelBuilder extends BCodeHelpers {
3333
import coreBTypes._
3434
import bCodeAsmCommon._
3535

36+
lazy val NativeAttr: Symbol = requiredClass[scala.native]
37+
3638
/*
3739
* There's a dedicated PlainClassBuilder for each CompilationUnit,
3840
* which simplifies the initialization of per-class data structures in `genPlainClass()` which in turn delegates to `initJClass()`

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ class BTypesFromSymbols[I <: DottyBackendInterface](val int: I) extends BTypes {
2929
import int._
3030
import int.symExtensions
3131

32+
lazy val TransientAttr = requiredClass[scala.transient]
33+
lazy val VolatileAttr = requiredClass[scala.volatile]
34+
3235
val bCodeAsmCommon: BCodeAsmCommon[int.type ] = new BCodeAsmCommon(int)
3336
import bCodeAsmCommon._
3437

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -200,19 +200,6 @@ class DottyBackendInterface(val outputDirectory: AbstractFile, val superCallsMap
200200
}
201201
}
202202

203-
// Class symbols used in backend.
204-
// Vals because they are to frequent in scala programs so that they are already loaded by backend
205-
206-
lazy val NativeAttr: Symbol = requiredClass[scala.native]
207-
lazy val TransientAttr = requiredClass[scala.transient]
208-
lazy val VolatileAttr = requiredClass[scala.volatile]
209-
210-
val ScalaATTRName: String = "Scala"
211-
val ScalaSignatureATTRName: String = "ScalaSig"
212-
213-
// Module symbols used in backend
214-
val StringModule: Symbol = requiredClass[java.lang.String].linkedClass
215-
val ScalaRunTimeModule: Symbol = requiredModule[scala.runtime.ScalaRunTime.type]
216203

217204

218205
private val primitiveCompilationUnits = Set(

0 commit comments

Comments
 (0)