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

KT-2044 : "this" added in local variables table in bytecode for local functions also

Browse Source
This commit is contained in:
Natalia.Ukhorskaya
2012-06-01 13:56:11 +04:00
parent de605637e6
commit bacc76944d
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/CodegenUtil.java
+8
View File
@@ -69,6 +69,14 @@ public class CodegenUtil {
!(myClass.getParent() instanceof JetClassObject);
}
public static boolean isLocalFun(DeclarationDescriptor fd, BindingContext bindingContext) {
PsiElement psiElement = BindingContextUtils.descriptorToDeclaration(bindingContext, fd);
if(psiElement instanceof JetNamedFunction && psiElement.getParent() instanceof JetBlockExpression) {
return true;
}
return false;
}
public static boolean isNamedFun(DeclarationDescriptor fd, BindingContext bindingContext) {
PsiElement psiElement = BindingContextUtils.descriptorToDeclaration(bindingContext, fd);
compiler/backend/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+1 -2
View File
@@ -244,8 +244,7 @@ public class FunctionCodegen {
// TODO: specify signature
mv.visitLocalVariable("this", type.getDescriptor(), null, methodBegin, methodEnd, k++);
}
if (fun instanceof JetFunctionLiteralExpression) {
else if (fun instanceof JetFunctionLiteralExpression || CodegenUtil.isLocalFun(functionDescriptor, state.getBindingContext())) {
Type type = state.getInjector().getJetTypeMapper().mapType(
context.getThisDescriptor().getDefaultType(), MapTypeMode.VALUE);
mv.visitLocalVariable("this", type.getDescriptor(), null, methodBegin, methodEnd, k++);