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

ClassFormatError because of initializing variable with Any type with primitive value

Browse Source 
#KT-3524 Fixed
This commit is contained in:
Natalia.Ukhorskaya
2013-05-08 17:17:39 +04:00
parent 551c370242
commit 9e584ded11
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/PropertyCodegen.java
+3 -3
View File
@@ -122,9 +122,9 @@ public class PropertyCodegen extends GenerationStateAware {
private FieldVisitor generateBackingFieldAccess(PsiElement p, PropertyDescriptor propertyDescriptor) {
Object value = null;
JetExpression initializer = p instanceof JetProperty ? ((JetProperty) p).getInitializer() : null;
if (initializer != null) {
if (initializer instanceof JetConstantExpression && !propertyDescriptor.getType().isNullable()) {
if (p instanceof JetProperty && !ImplementationBodyCodegen.shouldInitializeProperty((JetProperty) p, typeMapper)) {
JetExpression initializer = ((JetProperty) p).getInitializer();
if (initializer != null) {
CompileTimeConstant<?> compileTimeValue = bindingContext.get(BindingContext.COMPILE_TIME_VALUE, initializer);
value = compileTimeValue != null ? compileTimeValue.getValue() : null;
}
compiler/testData/codegen/box/properties/kt3524.kt
+5
View File
@@ -0,0 +1,5 @@
val i: Any = 12
fun box(): String {
return if (i == 12) "OK" else "fail"
}
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+5
View File
@@ -3534,6 +3534,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
doTest("compiler/testData/codegen/box/properties/kt3118.kt");
}
@TestMetadata("kt3524.kt")
public void testKt3524() throws Exception {
doTest("compiler/testData/codegen/box/properties/kt3524.kt");
}
@TestMetadata("kt3551.kt")
public void testKt3551() throws Exception {
doTest("compiler/testData/codegen/box/properties/kt3551.kt");