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

Lookup fixed to search for SyntheticFieldDescriptor inside MethodContext

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-23 13:20:49 +03:00
committed by Mikhail Glukhikh
parent 98e0771ffa
commit 994feafd6e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
+5
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.codegen.binding.MutableClosure;
import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
import org.jetbrains.kotlin.resolve.inline.InlineUtil; import org.jetbrains.kotlin.resolve.inline.InlineUtil;
import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Label;
import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.Type;
@@ -68,6 +69,10 @@ public class MethodContext extends CodegenContext<CallableMemberDescriptor> {
@Override @Override
public StackValue lookupInContext(DeclarationDescriptor d, @Nullable StackValue result, GenerationState state, boolean ignoreNoOuter) { public StackValue lookupInContext(DeclarationDescriptor d, @Nullable StackValue result, GenerationState state, boolean ignoreNoOuter) {
if (d instanceof SyntheticFieldDescriptor) {
SyntheticFieldDescriptor fieldDescriptor = (SyntheticFieldDescriptor) d;
d = fieldDescriptor.getPropertyDescriptor();
}
if (getContextDescriptor() == d) { if (getContextDescriptor() == d) {
return result != null ? result : StackValue.LOCAL_0; return result != null ? result : StackValue.LOCAL_0;
} }