From 11c51cf2a8829ac10278c923d41a9ff36e8758eb Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 3 Jul 2014 17:33:18 +0400
Subject: [PATCH] Fixed incremental compilation for removed files.

---
 .../src/org/jetbrains/jet/codegen/PackageCodegen.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
index 2356350d5fc..fa210942f1e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java
@@ -25,6 +25,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import kotlin.Function0;
+import org.jetbrains.annotations.Mutable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.codegen.context.CodegenContext;
@@ -157,7 +158,7 @@ public class PackageCodegen {
         return callables;
     }
 
-    private void generateDelegationsToPreviouslyCompiled(@NotNull Map<CallableMemberDescriptor, Runnable> generateCallableMemberTasks) {
+    private void generateDelegationsToPreviouslyCompiled(@NotNull @Mutable Map<CallableMemberDescriptor, Runnable> generateCallableMemberTasks) {
         for (final DeserializedCallableMemberDescriptor member : previouslyCompiledCallables) {
             generateCallableMemberTasks.put(member, new Runnable() {
                 @Override
@@ -223,6 +224,8 @@ public class PackageCodegen {
             }
         }
 
+        generateDelegationsToPreviouslyCompiled(generateCallableMemberTasks);
+
         if (!generateCallableMemberTasks.isEmpty()) {
             generatePackageFacadeClass(generateCallableMemberTasks, bindings);
         }
@@ -234,8 +237,6 @@ public class PackageCodegen {
     ) {
         generateKotlinPackageReflectionField();
 
-        generateDelegationsToPreviouslyCompiled(tasks);
-
         for (CallableMemberDescriptor member : Ordering.from(MemberComparator.INSTANCE).sortedCopy(tasks.keySet())) {
             tasks.get(member).run();
         }