@@ -269,7 +269,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
269
269
)
270
270
clinit.visitCode()
271
271
272
- if (isCZParcelable) { legacyAddCreatorCode(clinit, cnode, thisName) }
272
+ legacyAddCreatorCode(clinit, cnode, thisName)
273
273
274
274
clinit.visitInsn(asm.Opcodes .RETURN )
275
275
clinit.visitMaxs(0 , 0 ) // just to follow protocol, dummy arguments
@@ -677,21 +677,6 @@ trait BCodeSkelBuilder extends BCodeHelpers {
677
677
mnode foreachInsn { i => if (i.getOpcode() == asm.Opcodes .RETURN ) { rets ::= i } }
678
678
if (rets.isEmpty) { return }
679
679
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
-
695
680
var insnParcA : asm.tree.AbstractInsnNode = null
696
681
var insnParcB : asm.tree.AbstractInsnNode = null
697
682
// android creator code
@@ -717,7 +702,6 @@ trait BCodeSkelBuilder extends BCodeHelpers {
717
702
718
703
// insert a few instructions for initialization before each return instruction
719
704
for (r <- rets) {
720
- insertBefore(r, insnModA, insnModB)
721
705
insertBefore(r, insnParcA, insnParcB)
722
706
}
723
707
0 commit comments