From 69efb81a129f12214a5e5eeda911c000beda59d4 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 21 Jun 2017 20:58:12 +0300
Subject: [PATCH] Minor refactoring in JavaModuleInfo

Remove unused declarations
---
 .../kotlin/resolve/jvm/modules/JavaModuleGraph.kt      |  6 +++---
 .../kotlin/resolve/jvm/modules/JavaModuleInfo.kt       | 10 ++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
index 94100ca14f2..da30745e461 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
@@ -29,9 +29,9 @@ class JavaModuleGraph(finder: JavaModuleFinder) {
         fun dfs(module: String) {
             if (!visited.add(module)) return
             val moduleInfo = moduleInfo(module) ?: return
-            for (dependency in moduleInfo.requires) {
-                if (dependency.isTransitive) {
-                    dfs(dependency.moduleName)
+            for ((moduleName, isTransitive) in moduleInfo.requires) {
+                if (isTransitive) {
+                    dfs(moduleName)
                 }
             }
         }
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
index bd55d0b5312..c5a4bf034b1 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
@@ -31,11 +31,9 @@ class JavaModuleInfo(
         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 Requires(val moduleName: String, val isTransitive: Boolean)
 
-    data class Exports(val packageFqName: FqName, val flags: Int, val toModules: List<String>)
+    data class Exports(val packageFqName: FqName, val toModules: List<String>)
 
     override fun toString(): String =
             "Module $moduleName (${requires.size} requires, ${exports.size} exports)"
@@ -54,11 +52,11 @@ class JavaModuleInfo(
 
                     return object : ModuleVisitor(Opcodes.ASM6) {
                         override fun visitRequire(module: String, access: Int, version: String?) {
-                            requires.add(Requires(module, access))
+                            requires.add(Requires(module, (access and ACC_TRANSITIVE) != 0))
                         }
 
                         override fun visitExport(packageFqName: String, access: Int, modules: Array<String>?) {
-                            exports.add(Exports(FqName(packageFqName), access, modules?.toList().orEmpty()))
+                            exports.add(Exports(FqName(packageFqName), modules?.toList().orEmpty()))
                         }
                     }
                 }