Make TypeConstructor.isFinal return false for enums

The reason is that before dc02b2e3ab and 8a0dcca957,
TypeConstructor.isFinal for some class descriptors
(DeserializedClassDescriptor, LazyJavaClassDescriptor,
MutableClassDescriptor) were implemented as `isFinalClass` (which is
`modality == FINAL && kind != ENUM_CLASS`), and all others as
`modality == FINAL` or simply true/false. This led to differences in
behavior depending on the exact instance of the class descriptor.
Now that TypeConstructor.isFinal is always `modality == FINAL`, some
tests (PseudoValueTestGenerated) fail because the finality of some type
constructors changed and these tests render final vs non-final type
constructors differently.

In this commit, TypeConstructor.isFinal is now made to behave safer,
i.e. considering enum class type constructor to be non-final (as was the
case earlier for some ClassDescriptor instances). Some diagnostics might
disappear (e.g. FINAL_UPPER_BOUND) but it doesn't look like a big deal
This commit is contained in:
Alexander Udalov
2017-10-17 16:34:17 +02:00
parent 825aff7ac6
commit 6e410cb182
9 changed files with 136 additions and 35 deletions
@@ -56,7 +56,7 @@ public abstract class AbstractClassTypeConstructor extends AbstractTypeConstruct
@Override
public final boolean isFinal() {
ClassDescriptor descriptor = getDeclarationDescriptor();
return descriptor.getModality() == Modality.FINAL && !descriptor.isExpect();
return ModalityKt.isFinalClass(descriptor) && !descriptor.isExpect();
}
@NotNull