Skip to content

Commit b07b47c

Browse files
committed
Remove legacy code
1 parent 967375d commit b07b47c

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
@@ -270,7 +270,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
270270
)
271271
clinit.visitCode()
272272

273-
if (isCZParcelable) { legacyAddCreatorCode(clinit, cnode, thisName) }
273+
legacyAddCreatorCode(clinit, cnode, thisName)
274274

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

728-
var insnModA: asm.tree.AbstractInsnNode = null
729-
var insnModB: asm.tree.AbstractInsnNode = null
730-
// call object's private ctor from static ctor
731-
if (isCZStaticModule) {
732-
// NEW `moduleName`
733-
val className = internalName(methSymbol.enclosingClass)
734-
insnModA = new asm.tree.TypeInsnNode(asm.Opcodes.NEW, className)
735-
// INVOKESPECIAL <init>
736-
val callee = methSymbol.enclosingClass.primaryConstructor
737-
val jname = callee.javaSimpleName
738-
val jowner = internalName(callee.owner)
739-
val jtype = asmMethodType(callee).descriptor
740-
insnModB = new asm.tree.MethodInsnNode(asm.Opcodes.INVOKESPECIAL, jowner, jname, jtype, false)
741-
}
742-
743728
var insnParcA: asm.tree.AbstractInsnNode = null
744729
var insnParcB: asm.tree.AbstractInsnNode = null
745730
// android creator code
@@ -765,7 +750,6 @@ trait BCodeSkelBuilder extends BCodeHelpers {
765750

766751
// insert a few instructions for initialization before each return instruction
767752
for(r <- rets) {
768-
insertBefore(r, insnModA, insnModB)
769753
insertBefore(r, insnParcA, insnParcB)
770754
}
771755

0 commit comments

Comments
 (0)