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

fix compilation of testlib agains stdlib.jar

Browse Source
This commit is contained in:
Stepan Koltsov
2012-01-18 12:10:30 +04:00
parent b8496fd2f6
commit 2d36f30d77
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+3 -10
View File
@@ -1092,10 +1092,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
} }
} }
} }
if(!(containingDeclaration instanceof JavaNamespaceDescriptor)) getter = typeMapper.mapGetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
getter = typeMapper.mapGetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION).getJvmMethodSignature().getAsmMethod();
else
getter = null;
if (propertyDescriptor.getGetter() == null) { if (propertyDescriptor.getGetter() == null) {
getter = null; getter = null;
@@ -1106,12 +1103,8 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> {
setter = null; setter = null;
} }
else { else {
if(!(containingDeclaration instanceof JavaNamespaceDescriptor)) { JvmPropertyAccessorSignature jvmMethodSignature = typeMapper.mapSetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION);
JvmPropertyAccessorSignature jvmMethodSignature = typeMapper.mapSetterSignature(propertyDescriptor, OwnerKind.IMPLEMENTATION); setter = jvmMethodSignature != null ? jvmMethodSignature.getJvmMethodSignature().getAsmMethod() : null;
setter = jvmMethodSignature != null ? jvmMethodSignature.getJvmMethodSignature().getAsmMethod() : null;
} else {
setter = null;
}
if (propertyDescriptor.getSetter() == null) { if (propertyDescriptor.getSetter() == null) {
setter = null; setter = null;