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

Make Array type parameter T non-reified

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-10-08 18:17:53 +03:00
parent 62c25c0370
commit 5449cea6b7
25 changed files with 62 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+4 -1
View File
@@ -579,6 +579,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
TypeConstructor typeConstructor = type.getConstructor();
ClassifierDescriptor typeDeclarationDescriptor = typeConstructor.getDeclarationDescriptor();
boolean typeIsArray = KotlinBuiltIns.isArray(type);
if (typeDeclarationDescriptor instanceof ClassDescriptor) {
List<TypeParameterDescriptor> parameters = typeConstructor.getParameters();
@@ -586,8 +587,10 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
Iterator<TypeProjection> typeArgumentsIterator = type.getArguments().iterator();
for (TypeParameterDescriptor parameter : parameters) {
if (!parameter.isReified()) return false;
if (!typeIsArray && !parameter.isReified()) return false;
TypeProjection typeArgument = typeArgumentsIterator.next();
if (typeArgument == null) return false;
if (typeArgument.isStarProjection()) return false;
if (!isClassAvailableAtRuntime(typeArgument.getType(), true)) return false;