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

Fix KT-25853 IDEA hangs when Kotlin bytecode tool window open...

Browse Source 
KotlinTypeMapper.findFirstDelegatingSuperCall can loop forever if the
code is invalid. Bail out.
This commit is contained in:
Dmitry Petrov
2018-09-07 15:33:08 +03:00
parent bbbca9fbbf
commit 4c7972a9e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java
+4 -4
View File
@@ -63,10 +63,7 @@ import org.jetbrains.kotlin.util.OperatorNameConventions;
import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.Type;
import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.org.objectweb.asm.commons.Method;
import java.util.Collection; import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import static org.jetbrains.kotlin.codegen.AsmUtil.isStaticMethod; import static org.jetbrains.kotlin.codegen.AsmUtil.isStaticMethod;
@@ -1681,10 +1678,13 @@ public class KotlinTypeMapper {
@Nullable @Nullable
private ResolvedCall<ConstructorDescriptor> findFirstDelegatingSuperCall(@NotNull ConstructorDescriptor descriptor) { private ResolvedCall<ConstructorDescriptor> findFirstDelegatingSuperCall(@NotNull ConstructorDescriptor descriptor) {
ClassifierDescriptorWithTypeParameters constructorOwner = descriptor.getContainingDeclaration(); ClassifierDescriptorWithTypeParameters constructorOwner = descriptor.getContainingDeclaration();
Set<ConstructorDescriptor> visited = new HashSet<>();
visited.add(descriptor);
while (true) { while (true) {
ResolvedCall<ConstructorDescriptor> next = getDelegationConstructorCall(bindingContext, descriptor); ResolvedCall<ConstructorDescriptor> next = getDelegationConstructorCall(bindingContext, descriptor);
if (next == null) return null; if (next == null) return null;
descriptor = next.getResultingDescriptor().getOriginal(); descriptor = next.getResultingDescriptor().getOriginal();
if (!visited.add(descriptor)) return null;
if (descriptor.getContainingDeclaration() != constructorOwner) return next; if (descriptor.getContainingDeclaration() != constructorOwner) return next;
} }
} }