Move JavaModuleInfo and JavaModuleGraph to frontend.java

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -74,8 +74,6 @@ import org.jetbrains.kotlin.cli.jvm.JvmRuntimeVersionsConsistencyChecker
 import org.jetbrains.kotlin.cli.jvm.config.*
 import org.jetbrains.kotlin.cli.jvm.index.*
 import org.jetbrains.kotlin.cli.jvm.modules.CoreJrtFileSystem
-import org.jetbrains.kotlin.cli.jvm.modules.JavaModuleInfo
-import org.jetbrains.kotlin.cli.jvm.modules.ModuleGraph
 import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.codegen.extensions.ExpressionCodegenExtension
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
@@ -98,6 +96,8 @@ import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade
 import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension
 import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
+import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleGraph
+import org.jetbrains.kotlin.resolve.jvm.modules.JavaModuleInfo
 import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
 import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
@@ -291,7 +291,7 @@ class KotlinCoreEnvironment private constructor(
     }
 
     private fun addModularJdkRoots(fileSystem: VirtualFileSystem, result: MutableList<JavaRoot>) {
-        val graph = ModuleGraph { moduleName ->
+        val graph = JavaModuleGraph { moduleName ->
             fileSystem.findFileByPath("/modules/$moduleName/module-info.class")?.let((JavaModuleInfo)::read) ?: run {
                 report(ERROR, "Module $moduleName cannot be found in the Java runtime image")
                 JavaModuleInfo(moduleName, emptyList(), emptyList())

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/JavaModuleInfo.kt

@@ -1,72 +0,0 @@
-/*
- * Copyright 2010-2017 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.kotlin.cli.jvm.modules
-
-import com.intellij.openapi.vfs.VirtualFile
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.utils.compactIfPossible
-import org.jetbrains.org.objectweb.asm.ClassReader
-import org.jetbrains.org.objectweb.asm.ClassVisitor
-import org.jetbrains.org.objectweb.asm.ModuleVisitor
-import org.jetbrains.org.objectweb.asm.Opcodes
-import org.jetbrains.org.objectweb.asm.Opcodes.ACC_TRANSITIVE
-import java.io.IOException
-
-class JavaModuleInfo(
-        val moduleName: String,
-        val requires: List<Requires>,
-        val exports: List<Exports>
-) {
-    data class Requires(val moduleName: String, val flags: Int) {
-        val isTransitive get() = (flags and ACC_TRANSITIVE) != 0
-    }
-
-    data class Exports(val packageFqName: FqName, val flags: Int, val toModules: List<String>)
-
-    override fun toString(): String =
-            "Module $moduleName (${requires.size} requires, ${exports.size} exports)"
-
-    companion object {
-        fun read(file: VirtualFile): JavaModuleInfo? {
-            val contents = try { file.contentsToByteArray() } catch (e: IOException) { return null }
-
-            var moduleName: String? = null
-            val requires = arrayListOf<Requires>()
-            val exports = arrayListOf<Exports>()
-
-            ClassReader(contents).accept(object : ClassVisitor(Opcodes.ASM6) {
-                override fun visitModule(name: String, access: Int, version: String?): ModuleVisitor {
-                    moduleName = name
-
-                    return object : ModuleVisitor(Opcodes.ASM6) {
-                        override fun visitRequire(module: String, access: Int, version: String?) {
-                            requires.add(Requires(module, access))
-                        }
-
-                        override fun visitExport(packageFqName: String, access: Int, modules: Array<String>?) {
-                            exports.add(Exports(FqName(packageFqName), access, modules?.toList().orEmpty()))
-                        }
-                    }
-                }
-            }, ClassReader.SKIP_DEBUG or ClassReader.SKIP_CODE or ClassReader.SKIP_FRAMES)
-
-            return if (moduleName != null)
-                JavaModuleInfo(moduleName!!, requires.compactIfPossible(), exports.compactIfPossible())
-            else null
-        }
-    }
-}

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/modules/ModuleGraph.kt

@@ -1,39 +0,0 @@
-/*
- * Copyright 2010-2017 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.kotlin.cli.jvm.modules
-
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-
-class ModuleGraph(getModuleInfo: (String) -> JavaModuleInfo) {
-    private val moduleInfo: (String) -> JavaModuleInfo = LockBasedStorageManager.NO_LOCKS.createMemoizedFunction(getModuleInfo)
-
-    fun getAllReachable(rootModules: List<String>): List<String> {
-        val visited = linkedSetOf<String>()
-
-        fun dfs(module: String) {
-            if (!visited.add(module)) return
-            for (dependency in moduleInfo(module).requires) {
-                if (dependency.isTransitive) {
-                    dfs(dependency.moduleName)
-                }
-            }
-        }
-
-        rootModules.forEach(::dfs)
-        return visited.toList()
-    }
-}