Skip to content

Commit 0d40657

Browse files
committed
Remove legacy code
1 parent 80c0e12 commit 0d40657

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
269269
)
270270
clinit.visitCode()
271271

272-
if (isCZParcelable) { legacyAddCreatorCode(clinit, cnode, thisName) }
272+
legacyAddCreatorCode(clinit, cnode, thisName)
273273

274274
clinit.visitInsn(asm.Opcodes.RETURN)
275275
clinit.visitMaxs(0, 0) // just to follow protocol, dummy arguments
@@ -677,21 +677,6 @@ trait BCodeSkelBuilder extends BCodeHelpers {
677677
mnode foreachInsn { i => if (i.getOpcode() == asm.Opcodes.RETURN) { rets ::= i } }
678678
if (rets.isEmpty) { return }
679679

680-
var insnModA: asm.tree.AbstractInsnNode = null
681-
var insnModB: asm.tree.AbstractInsnNode = null
682-
// call object's private ctor from static ctor
683-
if (isCZStaticModule) {
684-
// NEW `moduleName`
685-
val className = internalName(methSymbol.enclosingClass)
686-
insnModA = new asm.tree.TypeInsnNode(asm.Opcodes.NEW, className)
687-
// INVOKESPECIAL <init>
688-
val callee = methSymbol.enclosingClass.primaryConstructor
689-
val jname = callee.javaSimpleName
690-
val jowner = internalName(callee.owner)
691-
val jtype = asmMethodType(callee).descriptor
692-
insnModB = new asm.tree.MethodInsnNode(asm.Opcodes.INVOKESPECIAL, jowner, jname, jtype, false)
693-
}
694-
695680
var insnParcA: asm.tree.AbstractInsnNode = null
696681
var insnParcB: asm.tree.AbstractInsnNode = null
697682
// android creator code
@@ -717,7 +702,6 @@ trait BCodeSkelBuilder extends BCodeHelpers {
717702

718703
// insert a few instructions for initialization before each return instruction
719704
for(r <- rets) {
720-
insertBefore(r, insnModA, insnModB)
721705
insertBefore(r, insnParcA, insnParcB)
722706
}
723707

0 commit comments

Comments
 (0)