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

initialization of 'hasInferredReturnType' property

Browse Source 
moved to its getter
This commit is contained in:
svtk
2013-11-01 13:17:09 +04:00
parent 28e4642289
commit eea08cf4e1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java
+6 -3
View File
@@ -87,7 +87,7 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements ResolvedC
private ResolutionStatus status = UNKNOWN_STATUS; private ResolutionStatus status = UNKNOWN_STATUS;
private boolean hasUnknownTypeParameters = false; private boolean hasUnknownTypeParameters = false;
private ConstraintSystem constraintSystem = null; private ConstraintSystem constraintSystem = null;
private boolean hasInferredReturnType; private Boolean hasInferredReturnType = null;
private boolean completed = false; private boolean completed = false;
private ResolvedCallImpl( private ResolvedCallImpl(
@@ -289,14 +289,17 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements ResolvedC
} }
public boolean hasInferredReturnType() { public boolean hasInferredReturnType() {
if (!completed) throw new IllegalStateException("Inferred return type is not known before resolution completion."); if (!completed) {
hasInferredReturnType = constraintSystem == null || CallResolverUtil.hasInferredReturnType(candidateDescriptor, constraintSystem);
}
assert hasInferredReturnType != null : "The property 'hasInferredReturnType' was not set when the call was completed.";
return hasInferredReturnType; return hasInferredReturnType;
} }
@Override @Override
public void markCallAsCompleted() { public void markCallAsCompleted() {
if (!completed) { if (!completed) {
hasInferredReturnType = CallResolverUtil.hasInferredReturnType(candidateDescriptor, constraintSystem); hasInferredReturnType();
} }
trace = null; trace = null;
constraintSystem = null; constraintSystem = null;