Skip to content

Commit cb758bd

Browse files
authored
Merge pull request #3640 from dotty-staging/compact1
Restrict dotty-compiler to the jvm compact1 profile
2 parents 55c0fb6 + c30de2d commit cb758bd

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,6 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
691691
def hasPackageFlag: Boolean = sym is Flags.Package
692692
def isImplClass: Boolean = sym is Flags.ImplClass
693693
def isInterface: Boolean = (sym is Flags.PureInterface) || (sym is Flags.Trait)
694-
def hasGetter: Boolean = false // used only for generaration of beaninfo todo: implement
695694
def isGetter: Boolean = toDenot(sym).isGetter
696695
def isSetter: Boolean = toDenot(sym).isSetter
697696
def isGetClass: Boolean = sym eq defn.Any_getClass

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
100100

101101
private[this] var bytecodeWriter : BytecodeWriter = null
102102
private[this] var mirrorCodeGen : JMirrorBuilder = null
103-
private[this] var beanInfoCodeGen : JBeanInfoBuilder = null
104103

105104
/* ---------------- q1 ---------------- */
106105

@@ -126,7 +125,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
126125

127126
/*
128127
* An item of queue-3 (the last queue before serializing to disk) contains three of these
129-
* (one for each of mirror, plain, and bean classes).
128+
* (one for each of mirror and plain classes).
130129
*
131130
* @param jclassName internal name of the class
132131
* @param jclassBytes bytecode emitted for the class SubItem3 represents
@@ -180,7 +179,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
180179

181180
/*
182181
* Checks for duplicate internal names case-insensitively,
183-
* builds ASM ClassNodes for mirror, plain, and bean classes;
182+
* builds ASM ClassNodes for mirror and plain classes;
184183
* enqueues them in queue-2.
185184
*
186185
*/
@@ -339,7 +338,6 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
339338
// initBytecodeWriter invokes fullName, thus we have to run it before the typer-dependent thread is activated.
340339
bytecodeWriter = initBytecodeWriter(entryPoints)
341340
mirrorCodeGen = new JMirrorBuilder
342-
beanInfoCodeGen = new JBeanInfoBuilder
343341

344342
val needsOutfileForSymbol = bytecodeWriter.isInstanceOf[ClassBytecodeWriter]
345343
buildAndSendToDisk(needsOutfileForSymbol)

compiler/src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,8 +633,6 @@ class Definitions {
633633
def MigrationAnnot(implicit ctx: Context) = MigrationAnnotType.symbol.asClass
634634
lazy val NativeAnnotType = ctx.requiredClassRef("scala.native")
635635
def NativeAnnot(implicit ctx: Context) = NativeAnnotType.symbol.asClass
636-
lazy val RemoteAnnotType = ctx.requiredClassRef("scala.remote")
637-
def RemoteAnnot(implicit ctx: Context) = RemoteAnnotType.symbol.asClass
638636
lazy val RepeatedAnnotType = ctx.requiredClassRef("scala.annotation.internal.Repeated")
639637
def RepeatedAnnot(implicit ctx: Context) = RepeatedAnnotType.symbol.asClass
640638
lazy val SourceFileAnnotType = ctx.requiredClassRef("scala.annotation.internal.SourceFile")

0 commit comments

Comments
 (0)