azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for KT-3546: Exception when delegating to ArrayList

Browse Source 
#KT-3546 Fixed
This commit is contained in:
Mikhael Bogdanov
2013-06-18 12:59:48 +04:00
parent 8ac8798266
commit 79cf02ffb9
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+2 -1
View File
@@ -817,7 +817,8 @@ public class FunctionCodegen extends GenerationStateAware {
StackValue.onStack(overriddenMethod.getReturnType()).put(delegateMethod.getReturnType(), iv);
iv.areturn(delegateMethod.getReturnType());
endVisit(mv, "delegate method", descriptorToDeclaration(bindingContext, functionDescriptor));
endVisit(mv, "Delegate method " + functionDescriptor + " to " + jvmOverriddenMethodSignature,
descriptorToDeclaration(bindingContext, functionDescriptor.getContainingDeclaration()));
generateBridgeIfNeeded(owner, state, v, jvmDelegateMethodSignature.getAsmMethod(), functionDescriptor);
}