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

KT-4137: Verify error

Browse Source 
#KT-4137 Fixed
This commit is contained in:
Mikhael Bogdanov
2013-10-25 16:24:52 +04:00
parent 6074667fd4
commit e3882e2dfb
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/context/CodegenContext.java
+15 -5
View File
@@ -124,6 +124,10 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
}
public StackValue getOuterExpression(@Nullable StackValue prefix, boolean ignoreNoOuter) {
return getOuterExpression(prefix, ignoreNoOuter, true);
}
private StackValue getOuterExpression(@Nullable StackValue prefix, boolean ignoreNoOuter, boolean captureThis) {
if (outerExpression == null) {
if (ignoreNoOuter) {
return null;
@@ -132,8 +136,9 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
throw new UnsupportedOperationException();
}
}
closure.setCaptureThis();
if (captureThis) {
closure.setCaptureThis();
}
return prefix != null ? StackValue.composed(prefix, outerExpression) : outerExpression;
}
@@ -286,6 +291,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
public StackValue lookupInContext(DeclarationDescriptor d, @Nullable StackValue result, GenerationState state, boolean ignoreNoOuter) {
MutableClosure top = closure;
StackValue myOuter = null;
if (top != null) {
EnclosedValueDescriptor answer = closure.getCaptureVariables().get(d);
if (answer != null) {
@@ -306,11 +312,15 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
}
}
StackValue outer = getOuterExpression(null, ignoreNoOuter);
result = result == null || outer == null ? outer : StackValue.composed(result, outer);
myOuter = getOuterExpression(null, ignoreNoOuter, false);
result = result == null || myOuter == null ? myOuter : StackValue.composed(result, myOuter);
}
return parentContext != null ? parentContext.lookupInContext(d, result, state, ignoreNoOuter) : null;
StackValue resultValue = parentContext != null ? parentContext.lookupInContext(d, result, state, ignoreNoOuter) : null;
if (myOuter != null && resultValue != null) {
closure.setCaptureThis();
}
return resultValue;
}
@NotNull