[KLIB] Cutting down usages of moduleDescriptor in linker

Replace map key `ModuleDescriptor` with `String` which is module name
This commit is contained in:
Roman Artemev
2021-06-30 14:57:51 +03:00
committed by teamcityserver
parent eadf252de9
commit 0326518fc9
6 changed files with 38 additions and 28 deletions
@@ -64,6 +64,7 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
companion object {
val SKIP_KLIB_TEST = Regex("""// SKIP_KLIB_TEST""")
const val MODULE_NAME = "testModule"
}
override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
@@ -83,7 +84,7 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
listOfNotNull(writeJavaFiles(files)),
files
)
configuration.put(CommonConfigurationKeys.MODULE_NAME, "testModule")
configuration.put(CommonConfigurationKeys.MODULE_NAME, MODULE_NAME)
myEnvironment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES)
}
@@ -194,7 +195,7 @@ abstract class AbstractKlibTextTestCase : CodegenTestCase() {
metadata = serializedMetadata,
dataFlowGraph = null,
manifestProperties = properties,
moduleName = irModuleFragment.name.asString(),
moduleName = MODULE_NAME,
nopack = true,
perFile = false,
output = klibDir.canonicalPath,