From d9c70b5927ccd5dbe6856b8be5ed3682a8c1dd10 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 15 May 2015 14:14:52 +0300 Subject: [PATCH] Drop TopDownAnalysisParameters#isAnalyzingBootstrapLibrary() --- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 5 +---- .../resolve/jvm/TopDownAnalyzerFacadeForJVM.java | 1 - .../jetbrains/kotlin/resolve/OverrideResolver.java | 6 ++---- .../kotlin/resolve/TopDownAnalysisParameters.java | 12 ++---------- .../types/expressions/LocalClassifierAnalyzer.kt | 2 +- .../kotlin/jvm/compiler/AbstractLoadJavaTest.java | 1 - .../kotlin/resolve/lazy/LazyResolveTestUtil.java | 3 +-- .../kotlin/idea/caches/resolve/KotlinResolveCache.kt | 2 +- .../js/analyze/TopDownAnalyzerFacadeForJS.java | 2 +- 9 files changed, 9 insertions(+), 25 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 7e9eafbf33f..5be0854ab82 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -112,10 +112,7 @@ public class ReplInterpreter { GlobalContextImpl context = ContextPackage.GlobalContext(); - TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create( - false, - true - ); + TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create(true); scriptDeclarationFactory = new ScriptMutableDeclarationProviderFactory(); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java index 99b60879551..92e00669514 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java @@ -92,7 +92,6 @@ public enum TopDownAnalyzerFacadeForJVM { @Nullable IncrementalCacheProvider incrementalCacheProvider ) { TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create( - false, false ); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java index da5596a85ca..a39eaf213e5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java @@ -257,13 +257,11 @@ public class OverrideResolver { private void checkOverrides(@NotNull TopDownAnalysisContext c) { for (Map.Entry entry : c.getDeclaredClasses().entrySet()) { - checkOverridesInAClass(c, entry.getValue(), entry.getKey()); + checkOverridesInAClass(entry.getValue(), entry.getKey()); } } - private void checkOverridesInAClass(@NotNull TopDownAnalysisContext c, @NotNull ClassDescriptorWithResolutionScopes classDescriptor, @NotNull JetClassOrObject klass) { - if (c.getTopDownAnalysisParameters().isAnalyzingBootstrapLibrary()) return; - + private void checkOverridesInAClass(@NotNull ClassDescriptorWithResolutionScopes classDescriptor, @NotNull JetClassOrObject klass) { // Check overrides for internal consistency for (CallableMemberDescriptor member : classDescriptor.getDeclaredCallableMembers()) { checkOverrideForMember(member); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java index f8a6272f400..88eddb619c4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java @@ -31,35 +31,27 @@ public class TopDownAnalysisParameters extends TypeLazinessToken { @NotNull public static TopDownAnalysisParameters create( - boolean analyzingBootstrapLibrary, boolean declaredLocally ) { - return new TopDownAnalysisParameters(analyzingBootstrapLibrary, declaredLocally, true); + return new TopDownAnalysisParameters(declaredLocally, true); } @NotNull public static TopDownAnalysisParameters createForLocalDeclarations() { - return new TopDownAnalysisParameters(false, true, false); + return new TopDownAnalysisParameters(true, false); } - private final boolean analyzingBootstrapLibrary; private final boolean declaredLocally; private final boolean lazyTopDownAnalysis; private TopDownAnalysisParameters( - boolean analyzingBootstrapLibrary, boolean declaredLocally, boolean lazyTopDownAnalysis ) { - this.analyzingBootstrapLibrary = analyzingBootstrapLibrary; this.declaredLocally = declaredLocally; this.lazyTopDownAnalysis = lazyTopDownAnalysis; } - public boolean isAnalyzingBootstrapLibrary() { - return analyzingBootstrapLibrary; - } - public boolean isDeclaredLocally() { return declaredLocally; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt index 8e730713395..14416458101 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt @@ -62,7 +62,7 @@ public class LocalClassifierAnalyzer( additionalCheckerProvider: AdditionalCheckerProvider, dynamicTypesSettings: DynamicTypesSettings ) { - val topDownAnalysisParameters = TopDownAnalysisParameters.create(false, true) + val topDownAnalysisParameters = TopDownAnalysisParameters.create(true) val moduleDescriptor = DescriptorUtils.getContainingModule(containingDeclaration) val injector = InjectorForLazyLocalClassifierAnalyzer( diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index 41c220c9f95..59d7c5ab118 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -151,7 +151,6 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createSealedJavaModule(); TopDownAnalysisParameters parameters = TopDownAnalysisParameters.create( - false, false ); diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java index ea45dedd55a..07e0b467acc 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.context.ContextPackage; -import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.name.Name; @@ -56,7 +55,7 @@ public class LazyResolveTestUtil { public static ModuleDescriptor resolve(@NotNull Project project, @NotNull BindingTrace trace, @NotNull List sourceFiles) { ModuleDescriptorImpl module = TopDownAnalyzerFacadeForJVM.createSealedJavaModule(); - TopDownAnalysisParameters params = TopDownAnalysisParameters.create(false, false); + TopDownAnalysisParameters params = TopDownAnalysisParameters.create(false); TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationNoIncremental(project, ContextPackage.GlobalContext(), sourceFiles, trace, params, module); return module; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index 36ea72ede73..a111ed12d73 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt @@ -233,7 +233,7 @@ private object KotlinResolveDataProvider { ).getLazyTopDownAnalyzerForTopLevel()!! lazyTopDownAnalyzer.analyzeDeclarations( - TopDownAnalysisParameters.create(false, false), + TopDownAnalysisParameters.create(false), listOf(analyzableElement) ) return AnalysisResult.success( diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java index 9722219826b..f3a692315e7 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java @@ -79,7 +79,7 @@ public final class TopDownAnalyzerFacadeForJS { GlobalContextImpl globalContext = ContextPackage.GlobalContext(); TopDownAnalysisParameters topDownAnalysisParameters = TopDownAnalysisParameters.create( - false, false); + false); Collection allFiles = Config.withJsLibAdded(files, config);