From d310b0c99df45166ea73200cae8e3fc870809b26 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 23 Jan 2015 19:37:02 +0300 Subject: [PATCH] Got rid of the LAZY flag --- .../cli/jvm/compiler/CliLightClassGenerationSupport.java | 2 +- .../kotlin/resolve/TopDownAnalysisParameters.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java index 77e837e27c3..b9bb0b3d7dc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -247,7 +247,7 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport public V get(ReadOnlySlice slice, K key) { V value = super.get(slice, key); - if (value == null && TopDownAnalysisParameters.LAZY) { + if (value == null) { if (BindingContext.FUNCTION == slice || BindingContext.VARIABLE == slice) { if (key instanceof JetDeclaration) { JetDeclaration jetDeclaration = (JetDeclaration) key; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java index 7b3455f2d9c..003d3ae58e1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java @@ -28,12 +28,6 @@ import org.jetbrains.kotlin.storage.StorageManager; * Various junk that cannot be placed into context (yet). */ public class TopDownAnalysisParameters extends LazinessToken implements GlobalContext { - @Deprecated - public static final boolean LAZY; - - static { - LAZY = !"false".equals(System.getProperty("lazy.tda")); - } @NotNull public static TopDownAnalysisParameters create( @@ -44,7 +38,7 @@ public class TopDownAnalysisParameters extends LazinessToken implements GlobalCo boolean declaredLocally ) { return new TopDownAnalysisParameters(storageManager, exceptionTracker, analyzeCompletely, analyzingBootstrapLibrary, - declaredLocally, LAZY); + declaredLocally, true); } @NotNull