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

fix getting compile time initializer before computing deferred type

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-02-19 15:49:29 +03:00
parent a030585566
commit ead3a1dc65
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java
+6
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant;
import org.jetbrains.kotlin.storage.NullableLazyValue; import org.jetbrains.kotlin.storage.NullableLazyValue;
import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.LazyType;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -59,6 +60,11 @@ public abstract class VariableDescriptorImpl extends DeclarationDescriptorNonRoo
@Nullable @Nullable
@Override @Override
public CompileTimeConstant<?> getCompileTimeInitializer() { public CompileTimeConstant<?> getCompileTimeInitializer() {
// Force computation and setting of compileTimeInitializer, if needed
if (compileTimeInitializer == null && outType instanceof LazyType) {
outType.getConstructor();
}
if (compileTimeInitializer != null) { if (compileTimeInitializer != null) {
return compileTimeInitializer.invoke(); return compileTimeInitializer.invoke();
} }