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

Backend: generate default values for annotation parameters in light classes mode

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-10-28 15:25:26 +03:00
parent 0b11dc1d7f
commit 4a3632f70e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
+6 -5
View File
@@ -203,11 +203,12 @@ public class PropertyCodegen {
null null
); );
if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { KtExpression defaultValue = p.getDefaultValue();
KtExpression defaultValue = p.getDefaultValue(); if (defaultValue != null) {
if (defaultValue != null) { ConstantValue<?> constant = ExpressionCodegen.getCompileTimeConstant(defaultValue, bindingContext);
ConstantValue<?> constant = ExpressionCodegen.getCompileTimeConstant(defaultValue, bindingContext); assert state.getClassBuilderMode() != ClassBuilderMode.FULL || constant != null
assert constant != null : "Default value for annotation parameter should be compile time value: " + defaultValue.getText(); : "Default value for annotation parameter should be compile time value: " + defaultValue.getText();
if (constant != null) {
AnnotationCodegen annotationCodegen = AnnotationCodegen.forAnnotationDefaultValue(mv, typeMapper); AnnotationCodegen annotationCodegen = AnnotationCodegen.forAnnotationDefaultValue(mv, typeMapper);
annotationCodegen.generateAnnotationDefaultValue(constant, descriptor.getType()); annotationCodegen.generateAnnotationDefaultValue(constant, descriptor.getType());
} }