Set the bridge bit on the synthetic overload methods

JakeWharton · Jan 28, 2019 · ed92727 · ed92727
1 parent d579a91
commit ed92727
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/...-compiler/src/main/java/com/jakewharton/overloadreturn/compiler/OverloadReturnCompiler.kt b/...-compiler/src/main/java/com/jakewharton/overloadreturn/compiler/OverloadReturnCompiler.kt
@@ -2,6 +2,7 @@ package com.jakewharton.overloadreturn.compiler
 
 import org.objectweb.asm.ClassReader
 import org.objectweb.asm.ClassWriter
+import org.objectweb.asm.Opcodes.ACC_BRIDGE
 import org.objectweb.asm.Opcodes.ACC_STATIC
 import org.objectweb.asm.Opcodes.ACC_SYNTHETIC
 import org.objectweb.asm.Opcodes.ALOAD
@@ -42,8 +43,8 @@ data class ClassInfo(
       val argumentTypes = Type.getArgumentTypes(target.descriptor)
       val newDescriptor = Type.getMethodDescriptor(target.returnOverload, *argumentTypes)
 
-      writer.visitMethod(target.access.withFlag(ACC_SYNTHETIC), target.name, newDescriptor,
-          target.signature, target.exceptions).apply {
+      writer.visitMethod(target.access.withFlags(ACC_BRIDGE, ACC_SYNTHETIC), target.name,
+          newDescriptor, target.signature, target.exceptions).apply {
         visitCode()
 
         var localIndex = 0

diff --git a/overload-return-compiler/src/main/java/com/jakewharton/overloadreturn/compiler/util.kt b/overload-return-compiler/src/main/java/com/jakewharton/overloadreturn/compiler/util.kt
@@ -45,4 +45,4 @@ internal fun Type.toReturnInstruction() = when (this) {
 internal infix fun Int.isFlagIn(value: Int) = (value and this) != 0
 internal infix fun Int.isNotFlagIn(value: Int) = (value and this) == 0
 
-internal fun Int.withFlag(flag: Int) = this or flag
+internal fun Int.withFlags(flag1: Int, flag2: Int) = this or flag1 or flag2
diff --git a/...piler/src/test/java/com/jakewharton/overloadreturn/compiler/OverloadReturnCompilerTest.kt b/...piler/src/test/java/com/jakewharton/overloadreturn/compiler/OverloadReturnCompilerTest.kt
@@ -69,8 +69,8 @@ class OverloadReturnCompilerTest {
           MAXSTACK = 1
           MAXLOCALS = 1
 
-        // access flags 0x1001
-        public synthetic method()V
+        // access flags 0x1041
+        public synthetic bridge method()V
           ALOAD 0
           INVOKEVIRTUAL com/example/Test.method ()I
           POP
@@ -141,8 +141,8 @@ class OverloadReturnCompilerTest {
           MAXSTACK = 1
           MAXLOCALS = 0
 
-        // access flags 0x1009
-        public static synthetic method()V
+        // access flags 0x1049
+        public static synthetic bridge method()V
           INVOKESTATIC com/example/Test.method ()I
           POP
           RETURN
@@ -210,8 +210,8 @@ class OverloadReturnCompilerTest {
           MAXSTACK = 1
           MAXLOCALS = 1
 
-        // access flags 0x1001
-        public synthetic method()Ljava/lang/CharSequence;
+        // access flags 0x1041
+        public synthetic bridge method()Ljava/lang/CharSequence;
           ALOAD 0
           INVOKEVIRTUAL com/example/Test.method ()Ljava/lang/String;
           ARETURN
@@ -278,8 +278,8 @@ class OverloadReturnCompilerTest {
           MAXSTACK = 1
           MAXLOCALS = 0
 
-        // access flags 0x1009
-        public static synthetic method()Ljava/lang/CharSequence;
+        // access flags 0x1049
+        public static synthetic bridge method()Ljava/lang/CharSequence;
           INVOKESTATIC com/example/Test.method ()Ljava/lang/String;
           ARETURN
           MAXSTACK = 1
@@ -355,8 +355,8 @@ class OverloadReturnCompilerTest {
           MAXSTACK = 12
           MAXLOCALS = 12
 
-        // access flags 0x1001
-        public synthetic method(ZBCDFIJSLjava/lang/Object;)Ljava/lang/CharSequence;
+        // access flags 0x1041
+        public synthetic bridge method(ZBCDFIJSLjava/lang/Object;)Ljava/lang/CharSequence;
           ALOAD 0
           ILOAD 1
           ILOAD 2