From 80aee299ba71daccaa0c4d36087ba25941b156a7 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Fri, 4 May 2012 23:57:14 +0400
Subject: [PATCH] remove nop code

---
 .../jvm/compiler/CompileEnvironmentUtil.java  | 23 -------------------
 .../compiler/KotlinToJVMBytecodeCompiler.java |  4 ----
 2 files changed, 27 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index 3d62e589963..8b76aec1b78 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -131,28 +131,6 @@ public class CompileEnvironmentUtil {
         return null;
     }
 
-    public static void ensureRuntime(JetCoreEnvironment environment, CompilerDependencies compilerDependencies) {
-        if (compilerDependencies.getCompilerSpecialMode() == CompilerSpecialMode.REGULAR) {
-            ensureJdkRuntime(environment);
-            ensureKotlinRuntime(environment);
-        }
-        else if (compilerDependencies.getCompilerSpecialMode() == CompilerSpecialMode.JDK_HEADERS) {
-            ensureJdkRuntime(environment);
-        }
-        else if (compilerDependencies.getCompilerSpecialMode() == CompilerSpecialMode.STDLIB) {
-            ensureJdkRuntime(environment);
-        }
-        else if (compilerDependencies.getCompilerSpecialMode() == CompilerSpecialMode.BUILTINS) {
-            // nop
-        }
-        else if (compilerDependencies.getCompilerSpecialMode() == CompilerSpecialMode.IDEA) {
-            // nop
-        }
-        else {
-            throw new IllegalStateException("unknown mode: " + compilerDependencies.getCompilerSpecialMode());
-        }
-    }
-
     public static List<Module> loadModuleScript(String moduleScriptFile, MessageCollector messageCollector) {
         Disposable disposable = new Disposable() {
             @Override
@@ -162,7 +140,6 @@ public class CompileEnvironmentUtil {
         };
         CompilerDependencies dependencies = CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.REGULAR);
         JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.getCoreEnvironmentForJVM(disposable, dependencies);
-        ensureRuntime(scriptEnvironment, dependencies);
         scriptEnvironment.addSources(moduleScriptFile);
 
         GenerationState generationState = KotlinToJVMBytecodeCompiler
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index fa0a13dccfa..e21c5525b64 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -72,8 +72,6 @@ public class KotlinToJVMBytecodeCompiler {
             configuration.getEnvironment().addToClasspath(new File(classpathRoot));
         }
 
-        CompileEnvironmentUtil.ensureRuntime(configuration.getEnvironment(), configuration.getEnvironment().getCompilerDependencies());
-
         GenerationState generationState = analyzeAndGenerate(configuration);
         if (generationState == null) {
             return null;
@@ -130,8 +128,6 @@ public class KotlinToJVMBytecodeCompiler {
             }
         }
 
-        CompileEnvironmentUtil.ensureRuntime(configuration.getEnvironment(), configuration.getEnvironment().getCompilerDependencies());
-
         GenerationState generationState = analyzeAndGenerate(configuration);
         if (generationState == null) {
             return false;