azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add file name to exception on invalid module-info.class in dependencies

Browse Source 
This will help users in working around KT-23025
This commit is contained in:
Alexander Udalov
2018-09-26 19:15:43 +02:00
parent 7624dbbb20
commit 9f6575c57f
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+20 -12
View File
@@ -64,22 +64,30 @@ class JavaModuleInfo(
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
try {
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 and ACC_TRANSITIVE) != 0))
}
return object : ModuleVisitor(Opcodes.ASM6) {
override fun visitRequire(module: String, access: Int, version: String?) {
requires.add(Requires(module, (access and ACC_TRANSITIVE) != 0))
}
override fun visitExport(packageFqName: String, access: Int, modules: Array<String>?) {
// For some reason, '/' is the delimiter in packageFqName here
exports.add(Exports(FqName(packageFqName.replace('/', '.')), modules?.toList().orEmpty()))
override fun visitExport(packageFqName: String, access: Int, modules: Array<String>?) {
// For some reason, '/' is the delimiter in packageFqName here
exports.add(Exports(FqName(packageFqName.replace('/', '.')), modules?.toList().orEmpty()))
}
}
}
}
}, ClassReader.SKIP_DEBUG or ClassReader.SKIP_CODE or ClassReader.SKIP_FRAMES)
}, ClassReader.SKIP_DEBUG or ClassReader.SKIP_CODE or ClassReader.SKIP_FRAMES)
} catch (e: Exception) {
throw IllegalStateException(
"Could not load module definition from: $file. The file might be broken " +
"by incorrect post-processing via bytecode tools. Please remove this file from the classpath.",
e
)
}
return if (moduleName != null)
JavaModuleInfo(moduleName!!, requires.compact(), exports.compact())