Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix [toolchain]:Prevent usage of outdated compilation outputs in incremenal compilatiation #3728

Merged
merged 1 commit into from
Feb 1, 2024
Merged

fix [toolchain]:Prevent usage of outdated compilation outputs in incremenal compilatiation #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions tools/src/main/scala/scala/scalanative/codegen/IncrementalCodeGenContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ import java.nio.file.{Path, Paths, Files}
import scala.collection.concurrent.TrieMap
import scala.io.Source
import scala.language.implicitConversions
import scala.scalanative.build.Build

class IncrementalCodeGenContext(workDir: Path) {
class IncrementalCodeGenContext(config: build.Config) {
private val package2hash: TrieMap[String, Long] = TrieMap[String, Long]()
private val pack2hashPrev: TrieMap[String, Long] = TrieMap[String, Long]()
private val changed: TrieMap[String, Long] = TrieMap[String, Long]()
private val dumpPackage2hash: Path = workDir.resolve("package2hash")
private val dumpPackage2hash: Path = config.workDir.resolve("package2hash")

def collectFromPreviousState(): Unit = {
if (Files.exists(dumpPackage2hash)) {
if (Build.userConfigHasChanged(config))
Files.deleteIfExists(dumpPackage2hash)
else if (Files.exists(dumpPackage2hash)) {
Source
.fromFile(dumpPackage2hash.toUri())
.getLines()
Expand Down
2 changes: 1 addition & 1 deletion tools/src/main/scala/scala/scalanative/codegen/llvm/CodeGen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ object CodeGen {

// Incremental compilation code generation
def seperateIncrementally(): IRGenerators = {
val ctx = new IncrementalCodeGenContext(config.workDir)
val ctx = new IncrementalCodeGenContext(config)
ctx.collectFromPreviousState()

// Partition into multiple LLVM IR files per Scala source file originated from.
Expand Down