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

Clarified assertion for EA-50536.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-10-14 17:32:15 +04:00
parent a759fc2454
commit e9880e6787
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+5 -3
View File
@@ -58,10 +58,12 @@ public class SignaturesPropagationData {
KotlinToJvmSignatureMapper.class.getClassLoader() KotlinToJvmSignatureMapper.class.getClassLoader()
).iterator().next(); ).iterator().next();
private final JavaMethodDescriptor autoMethodDescriptor;
private final List<TypeParameterDescriptor> modifiedTypeParameters; private final List<TypeParameterDescriptor> modifiedTypeParameters;
private final ValueParameters modifiedValueParameters; private final ValueParameters modifiedValueParameters;
private final JetType modifiedReturnType;
private final JetType modifiedReturnType;
private final List<String> signatureErrors = Lists.newArrayList(); private final List<String> signatureErrors = Lists.newArrayList();
private final List<FunctionDescriptor> superFunctions; private final List<FunctionDescriptor> superFunctions;
private final Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> autoTypeParameterToModified; private final Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> autoTypeParameterToModified;
@@ -77,7 +79,7 @@ public class SignaturesPropagationData {
) { ) {
this.containingClass = containingClass; this.containingClass = containingClass;
JavaMethodDescriptor autoMethodDescriptor = autoMethodDescriptor =
createAutoMethodDescriptor(containingClass, method, autoReturnType, receiverType, autoValueParameters, autoTypeParameters); createAutoMethodDescriptor(containingClass, method, autoReturnType, receiverType, autoValueParameters, autoTypeParameters);
superFunctions = getSuperFunctionsForMethod(method, autoMethodDescriptor, containingClass); superFunctions = getSuperFunctionsForMethod(method, autoMethodDescriptor, containingClass);
@@ -626,7 +628,7 @@ public class SignaturesPropagationData {
) { ) {
ClassifierDescriptor classifier = autoType.getConstructor().getDeclarationDescriptor(); ClassifierDescriptor classifier = autoType.getConstructor().getDeclarationDescriptor();
if (!(classifier instanceof ClassDescriptor)) { if (!(classifier instanceof ClassDescriptor)) {
assert classifier != null : "no declaration descriptor for type " + autoType; assert classifier != null : "no declaration descriptor for type " + autoType + ", auto method descriptor: " + autoMethodDescriptor;
if (classifier instanceof TypeParameterDescriptor && autoTypeParameterToModified.containsKey(classifier)) { if (classifier instanceof TypeParameterDescriptor && autoTypeParameterToModified.containsKey(classifier)) {
return autoTypeParameterToModified.get(classifier); return autoTypeParameterToModified.get(classifier);