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

Do not process annotations twice in LAZY mode

Browse Source
This commit is contained in:
Andrey Breslav
2014-02-26 18:30:26 +04:00
parent 81f2f79c79
commit 5251b3286e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+7 -2
View File
@@ -122,7 +122,10 @@ public class BodyResolver {
resolveDelegationSpecifierLists(c); resolveDelegationSpecifierLists(c);
resolvePropertyDeclarationBodies(c); resolvePropertyDeclarationBodies(c);
resolveClassAnnotations(c);
if (!TopDownAnalyzer.LAZY) {
resolveClassAnnotations(c);
}
resolveAnonymousInitializers(c); resolveAnonymousInitializers(c);
resolvePrimaryConstructorParameters(c); resolvePrimaryConstructorParameters(c);
@@ -589,7 +592,9 @@ public class BodyResolver {
JetScope declaringScope = c.getDeclaringScopes().apply(declaration); JetScope declaringScope = c.getDeclaringScopes().apply(declaration);
assert declaringScope != null; assert declaringScope != null;
resolveAnnotationArguments(declaringScope, declaration); if (!TopDownAnalyzer.LAZY || c.getTopDownAnalysisParameters().isDeclaredLocally()) {
resolveAnnotationArguments(declaringScope, declaration);
}
resolveFunctionBody(c, trace, declaration, descriptor, declaringScope); resolveFunctionBody(c, trace, declaration, descriptor, declaringScope);
assert descriptor.getReturnType() != null; assert descriptor.getReturnType() != null;