From 61d4f51cde5c002b4a1dc9270f1e0e3639d86112 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 26 Jun 2012 19:23:41 +0200 Subject: [PATCH] THe 'reified' annotation respected in Lazy resolve --- .../jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java index 7543fb27a2f..02cd7a5e37d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyTypeParameterDescriptor.java @@ -32,6 +32,7 @@ import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.JetStandardClasses; +import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.util.lazy.LazyValue; import java.util.Collection; @@ -59,6 +60,7 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor { private Set classObjectBounds; private JetType classObjectBoundsAsType; + private final boolean reified; public LazyTypeParameterDescriptor( @NotNull ResolveSession resolveSession, @@ -72,11 +74,12 @@ public class LazyTypeParameterDescriptor implements TypeParameterDescriptor { this.containingDeclaration = containingDeclaration; this.index = index; this.name = jetTypeParameter.getNameAsName(); + this.reified = jetTypeParameter.hasModifier(JetTokens.REIFIED_KEYWORD); } @Override public boolean isReified() { - return false; + return reified; } @Override