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

Fix default property setter generation

Browse Source
This commit is contained in:
Michael Bogdanov
2014-11-18 15:05:36 +03:00
parent 9bac3a8055
commit 5a8944085a
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+9 -8
View File
@@ -43,6 +43,8 @@ import org.jetbrains.org.objectweb.asm.Type;
import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.org.objectweb.asm.commons.Method;
import java.util.List;
import static org.jetbrains.jet.codegen.AsmUtil.*; import static org.jetbrains.jet.codegen.AsmUtil.*;
import static org.jetbrains.jet.codegen.JvmCodegenUtil.getParentBodyCodegen; import static org.jetbrains.jet.codegen.JvmCodegenUtil.getParentBodyCodegen;
import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.jet.codegen.JvmCodegenUtil.isInterface;
@@ -388,16 +390,15 @@ public class PropertyCodegen {
v.areturn(type); v.areturn(type);
} }
else if (callableDescriptor instanceof PropertySetterDescriptor) { else if (callableDescriptor instanceof PropertySetterDescriptor) {
ReceiverParameterDescriptor receiverParameter = propertyDescriptor.getExtensionReceiverParameter(); List<ValueParameterDescriptor> valueParameters = callableDescriptor.getValueParameters();
int paramCode = codegen.getContext().getContextKind() != OwnerKind.PACKAGE ? 1 : 0; assert valueParameters.size() == 1 : "Property setter should have only one value parameter but has " + callableDescriptor;
if (receiverParameter != null) { int parameterIndex = codegen.lookupLocalIndex(valueParameters.get(0));
paramCode += codegen.typeMapper.mapType(receiverParameter.getType()).getSize(); assert parameterIndex >= 0 : "Local index for setter parameter should be positive or zero: " + callableDescriptor;
}
Type type = codegen.typeMapper.mapType(propertyDescriptor); Type type = codegen.typeMapper.mapType(propertyDescriptor);
StackValue.Local value = StackValue.local(paramCode, type); property.store(StackValue.local(parameterIndex, type), codegen.v);
property.store(value, codegen.v);
v.visitInsn(RETURN); v.visitInsn(RETURN);
} else { }
else {
throw new IllegalStateException("Unknown property accessor: " + callableDescriptor); throw new IllegalStateException("Unknown property accessor: " + callableDescriptor);
} }
} }
compiler/testData/codegen/boxWithStdlib/platformStatic/propertyInc.kt
+6 -10
View File
@@ -12,20 +12,16 @@ object A {
} }
fun box(): String { fun box(): String {
if (A.test1() != "OK") return "fail 1"
if (A.test2() != "OK") return "fail 2" A.a++
if (A.a != 2) return "fail 1"
if (A.test3() != "1OK") return "fail 3" A.b++
if (A.b != 2) return "fail 2"
if (A.test4() != "1OK") return "fail 4" A.c++
if (A.c != 2) return "fail 3"
if (with(A) {"1".test5()} != "1OK") return "fail 5"
if (A.c != "OK") return "fail 6"
return "OK" return "OK"
} }