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

Guard creation of LazyClassDescriptor with lock to avoid getting 'this' in invalid state

Browse Source
This commit is contained in:
Nikolay Krasko
2013-08-07 14:44:05 +04:00
parent 70ae9e589c
commit e402c4d527
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java
+11 -4
View File
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Function; import com.intellij.util.Function;
@@ -193,7 +194,7 @@ public class ResolveSession implements KotlinCodeAnalyzer {
/*package*/ LazyClassDescriptor getClassObjectDescriptor(JetClassObject classObject) { /*package*/ LazyClassDescriptor getClassObjectDescriptor(JetClassObject classObject) {
JetClass aClass = PsiTreeUtil.getParentOfType(classObject, JetClass.class); JetClass aClass = PsiTreeUtil.getParentOfType(classObject, JetClass.class);
LazyClassDescriptor parentClassDescriptor; final LazyClassDescriptor parentClassDescriptor;
if (aClass != null) { if (aClass != null) {
parentClassDescriptor = (LazyClassDescriptor) getClassDescriptor(aClass); parentClassDescriptor = (LazyClassDescriptor) getClassDescriptor(aClass);
@@ -212,10 +213,16 @@ public class ResolveSession implements KotlinCodeAnalyzer {
if (declaration == null) { if (declaration == null) {
// It's possible that there are several class objects and another class object is taking part in lazy resolve. We still want to // It's possible that there are several class objects and another class object is taking part in lazy resolve. We still want to
// build descriptors for such class objects. // build descriptors for such class objects.
JetClassLikeInfo classObjectInfo = parentClassDescriptor.getClassObjectInfo(classObject); final JetClassLikeInfo classObjectInfo = parentClassDescriptor.getClassObjectInfo(classObject);
if (classObjectInfo != null) { if (classObjectInfo != null) {
Name name = DescriptorUtils.getClassObjectName(parentClassDescriptor.getName().asString()); final Name name = DescriptorUtils.getClassObjectName(parentClassDescriptor.getName().asString());
return new LazyClassDescriptor(this, parentClassDescriptor, name, classObjectInfo); return storageManager.compute(new Computable<LazyClassDescriptor>() {
@Override
public LazyClassDescriptor compute() {
// Create under lock to avoid premature access to published 'this'
return new LazyClassDescriptor(ResolveSession.this, parentClassDescriptor, name, classObjectInfo);
}
});
} }
} }