Loading descriptors from incremental cache instead of package classes.

compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java

@@ -38,4 +38,10 @@ public class JVMConfigurationKeys {
 
     public static final CompilerConfigurationKey<Boolean> ENABLE_INLINE =
             CompilerConfigurationKey.create("enable inline");
+
+    public static final CompilerConfigurationKey<File> INCREMENTAL_CACHE_BASE_DIR =
+            CompilerConfigurationKey.create("incremental cache base dir");
+
+    public static final CompilerConfigurationKey<List<String>> MODULE_IDS =
+            CompilerConfigurationKey.create("module id strings");
 }

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliSourcesMemberFilter.kt

@@ -1,41 +0,0 @@
-/*
- * Copyright 2010-2014 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.cli.jvm.compiler
-
-import org.jetbrains.jet.descriptors.serialization.descriptors.MemberFilter
-import org.jetbrains.jet.descriptors.serialization.ProtoBuf
-import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils.getPackagePartInternalName
-import org.jetbrains.jet.descriptors.serialization.NameResolver
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
-import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor
-import org.jetbrains.jet.lang.resolve.java.JvmClassName
-import org.jetbrains.jet.codegen.AsmUtil
-import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
-
-public class CliSourcesMemberFilter(environment: JetCoreEnvironment): MemberFilter {
-    val packagePartClassNames = environment.getSourceFiles().map { PackagePartClassUtils.getPackagePartInternalName(it) }.toSet()
-
-    override fun acceptPackagePartClass(container: PackageFragmentDescriptor, member: ProtoBuf.Callable, nameResolver: NameResolver): Boolean {
-        if (member.hasExtension(JavaProtoBuf.implClassName)) {
-            val shortName = nameResolver.getName(member.getExtension(JavaProtoBuf.implClassName)!!)
-            val fqName = container.fqName.child(shortName)
-            val internalName = AsmUtil.internalNameByFqNameWithoutInnerClasses(fqName)
-            return internalName !in packagePartClassNames
-        }
-        return true
-    }
-}

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java

@@ -324,7 +324,7 @@ public class CompileEnvironmentUtil {
         return result;
     }
 
-    private static class DescriptionToModuleAdapter implements Module {
+    static class DescriptionToModuleAdapter implements Module {
         private final ModuleDescription description;
 
         public DescriptionToModuleAdapter(ModuleDescription description) {
@@ -360,5 +360,10 @@ public class CompileEnvironmentUtil {
         public List<String> getAnnotationsRoots() {
             return description.getAnnotationsRoots();
         }
+
+        @Nullable
+        public String getIncrementalCacheDir() {
+            return description.getIncrementalCacheDir();
+        }
     }
 }

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -51,6 +51,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.ScriptNameUtil;
 import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
+import org.jetbrains.jet.lang.resolve.kotlin.incremental.CliSourcesMemberFilter;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.plugin.MainFunctionDetector;
 import org.jetbrains.jet.utils.KotlinPaths;
@@ -162,7 +163,18 @@ public class KotlinToJVMBytecodeCompiler {
             for (String annotationsRoot : module.getAnnotationsRoots()) {
                 configuration.add(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY, new File(annotationsRoot));
             }
+
+            configuration.add(JVMConfigurationKeys.MODULE_IDS, module.getModuleName());
         }
+
+        Module anyModule = chunk.get(0);
+        if (anyModule instanceof CompileEnvironmentUtil.DescriptionToModuleAdapter) {
+            String incrementalCacheDir = ((CompileEnvironmentUtil.DescriptionToModuleAdapter) anyModule).getIncrementalCacheDir();
+            if (incrementalCacheDir != null) {
+                configuration.put(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR, new File(incrementalCacheDir));
+            }
+        }
+
         return configuration;
     }
 
@@ -286,7 +298,10 @@ public class KotlinToJVMBytecodeCompiler {
                                 sharedTrace,
                                 Predicates.<PsiFile>alwaysTrue(),
                                 sharedModule,
-                                new CliSourcesMemberFilter(environment));
+                                new CliSourcesMemberFilter(environment.getSourceFiles()),
+                                environment.getConfiguration().get(JVMConfigurationKeys.MODULE_IDS),
+                                environment.getConfiguration().get(JVMConfigurationKeys.INCREMENTAL_CACHE_BASE_DIR)
+                        );
                     }
                 }, environment.getSourceFiles()
         );