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

Rewrite correctContainerForLambda using uninitializedClasses

Browse Source
This commit is contained in:
Dmitry Petrov
2017-11-13 14:18:08 +03:00
parent e38bbbfc13
commit db2aad1857
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+7 -19
View File
@@ -137,7 +137,7 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
) { ) {
String simpleName = name.substring(name.lastIndexOf('/') + 1); String simpleName = name.substring(name.lastIndexOf('/') + 1);
ClassDescriptor classDescriptor = new SyntheticClassDescriptorForLambda( ClassDescriptor classDescriptor = new SyntheticClassDescriptorForLambda(
customContainer != null ? customContainer : correctContainerForLambda(callableDescriptor, element), customContainer != null ? customContainer : correctContainerForLambda(callableDescriptor),
Name.special("<closure-" + simpleName + ">"), Name.special("<closure-" + simpleName + ">"),
supertypes, supertypes,
element element
@@ -149,7 +149,7 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
@NotNull @NotNull
@SuppressWarnings("ConstantConditions") @SuppressWarnings("ConstantConditions")
private DeclarationDescriptor correctContainerForLambda(@NotNull CallableDescriptor descriptor, @NotNull KtElement function) { private DeclarationDescriptor correctContainerForLambda(@NotNull CallableDescriptor descriptor) {
DeclarationDescriptor container = descriptor.getContainingDeclaration(); DeclarationDescriptor container = descriptor.getContainingDeclaration();
// In almost all cases the function's direct container is the correct container to consider in JVM back-end // In almost all cases the function's direct container is the correct container to consider in JVM back-end
@@ -158,23 +158,11 @@ class CodegenAnnotatingVisitor extends KtVisitorVoid {
// in this case it's constructed in the outer code, despite being located under the object PSI- and descriptor-wise // in this case it's constructed in the outer code, despite being located under the object PSI- and descriptor-wise
// TODO: consider the possibility of fixing this in the compiler front-end // TODO: consider the possibility of fixing this in the compiler front-end
if (container instanceof ConstructorDescriptor && DescriptorUtils.isAnonymousObject(container.getContainingDeclaration())) { while (container instanceof ConstructorDescriptor) {
PsiElement element = function; ClassDescriptor classDescriptor = ((ConstructorDescriptor) container).getConstructedClass();
while (element != null) { if (!DescriptorUtils.isAnonymousObject(classDescriptor)) break;
PsiElement child = element; if (!uninitializedClasses.contains(classDescriptor)) break;
element = element.getParent(); container = classDescriptor.getContainingDeclaration();
if (bindingContext.get(DECLARATION_TO_DESCRIPTOR, element) == container) return container;
if (element instanceof KtObjectDeclaration &&
element.getParent() instanceof KtObjectLiteralExpression &&
child instanceof KtSuperTypeList) {
// If we're passing an anonymous object's super call, it means "container" is ConstructorDescriptor of that object.
// To reach outer context, we should call getContainingDeclaration() twice
// TODO: this is probably not entirely correct, mostly because DECLARATION_TO_DESCRIPTOR can return null
container = container.getContainingDeclaration().getContainingDeclaration();
}
}
} }
return container; return container;