HMPP: Fix isCommon calculation for the K2 HMPP case

2023-10-25 14:05:57 +02:00
parent 968dfddbc9
commit 76eda0095e
2 changed files with 9 additions and 1 deletions
@@ -512,7 +512,11 @@ fun CompilerConfiguration.configureSourceRoots(chunk: List<Module>, buildFile: F
        val commonSources = getBuildFilePaths(buildFile, module.getCommonSourceFiles()).toSet()

        for (path in getBuildFilePaths(buildFile, module.getSourceFiles())) {
-            addKotlinSourceRoot(path, isCommon = path in commonSources, hmppCliModuleStructure?.getModuleNameForSource(path))
+            addKotlinSourceRoot(
+                path,
+                isCommon = hmppCliModuleStructure?.isFromCommonModule(path) ?: (path in commonSources),
+                hmppCliModuleStructure?.getModuleNameForSource(path)
+            )
        }
    }