Merge remote branch 'origin/master'

2012-01-27 15:40:31 +03:00
parent 51e4fc986a e1743f0cd7
commit 703635d968
1 changed files with 1 additions and 1 deletions
@@ -447,7 +447,7 @@ public class FunctionCodegen {
        Method method = state.getTypeMapper().mapSignature(functionDescriptor.getName(), functionDescriptor).getAsmMethod();
        Method overriden = state.getTypeMapper().mapSignature(overriddenFunction.getName(), overriddenFunction.getOriginal()).getAsmMethod();
        if(differentMethods(method, overriden)) {
-            int flags = ACC_PUBLIC; // TODO.
+            int flags = ACC_PUBLIC | ACC_BRIDGE; // TODO.

            final MethodVisitor mv = v.newMethod(null, flags, jvmSignature.getName(), overriden.getDescriptor(), null, null);
            if (v.generateCode()) {