fix: Synchronize with scala-native main (#34)

* Synch with scala-native main
* Fix installing llvm on Windows
* Fix ScalaNativeP

Author: WojciechMazur

.github/workflows/CI.yml

@@ -24,7 +24,31 @@ jobs:
         if: ${{ startsWith(matrix.OS, 'windows') }}
         shell: pwsh
         run: |
-          Choco-Install -PackageName llvm -ArgumentList "--version=16.0.6", "--allow-downgrade", "--force"
+          $retryCount = 3
+          $retryDelay = 5  # seconds
+
+          function InstallLLVM {
+              Write-Host "Attempting to install LLVM (try $($retryCount + 1 - $global:retryAttempt) of $($retryCount + 1))..."
+              choco install llvm --version=17.0.6 --allow-downgrade --force
+          }
+
+          # Attempt to install LLVM with retries
+          for ($global:retryAttempt = 1; $global:retryAttempt -le $retryCount; $global:retryAttempt++) {
+              try {
+                  InstallLLVM
+                  Write-Host "LLVM installation successful!"
+                  break  # Exit the loop if installation is successful
+              } catch {
+                  Write-Host "Error installing LLVM: $_"
+                  if ($global:retryAttempt -lt $retryCount) {
+                      Write-Host "Retrying in $retryDelay seconds..."
+                      Start-Sleep -Seconds $retryDelay
+                  } else {
+                      Write-Host "Maximum retry attempts reached. Exiting."
+                      exit 1
+                  }
+              }
+          }
           echo "${env:ProgramFiles}\LLVM\bin" | Out-File -FilePath ${env:GITHUB_PATH} -Encoding utf8 -Append
           echo "LLVM_BIN=${env:ProgramFiles}\LLVM\bin" >> ${env:GITHUB_OUTPUT}
 

cli/src/main/scala/scala/scalanative/cli/ScalaNativeP.scala

@@ -11,7 +11,6 @@ import java.nio.file.Path
 import scala.scalanative.io.VirtualDirectory
 import scala.scalanative.nir.serialization.deserializeBinary
 import scala.annotation.tailrec
-import java.nio.ByteBuffer
 
 object ScalaNativeP {
 
@@ -109,40 +108,37 @@ object ScalaNativeP {
       def findInClasspathAndRead(
           classpath: Stream[VirtualDirectory],
           path: Path
-      ): Option[ByteBuffer] = {
+      ): Option[(VirtualDirectory, Path)] = {
         classpath match {
-          case Stream.Empty => None
           case dir #:: tail =>
             val found = dir.files
               .find(virtualDirPathMatches(_, path))
-              .map(dir.read(_))
             if (found.isEmpty) findInClasspathAndRead(tail, path)
-            else found
+            else Some(dir -> path)
+          case _ => None
         }
       }
 
-      def tryReadFromPath(path: Path): Option[ByteBuffer] = {
+      def tryReadFromPath(path: Path): Option[(VirtualDirectory, Path)] = {
         val file = path.toFile()
         val absPath = path.toAbsolutePath()
         // When classpath is explicitly provided don't try to read directly
         if (!options.usingDefaultClassPath || !file.exists()) None
         else
-          util.Try {
-            VirtualDirectory
-              .real(absPath.getParent())
-              .read(absPath.getFileName())
-          }.toOption
+          Some(
+            VirtualDirectory.real(absPath.getParent()) -> absPath.getFileName()
+          )
       }
 
       for {
         fileName <- options.classNames
         path = Paths.get(fileName).normalize()
-        content <-
+        (directory, dirPath) <-
           tryReadFromPath(path)
             .orElse(findInClasspathAndRead(cp, path))
             .orElse(fail(s"Not found file with name `${fileName}`"))
       } {
-        val defns = deserializeBinary(content, fileName)
+        val defns = deserializeBinary(directory, dirPath)
         printNIR(defns, options.verbose)
       }
     }

cli/src/main/scala/scala/scalanative/cli/utils/ConfigConverter.scala

@@ -101,7 +101,9 @@ object ConfigConverter {
       .withOptimizerConfig(generateOptimizerConfig(options.optimizerConifg))
       .withBaseName(baseName)
       .withMultithreadingSupport(options.nativeConfig.multithreadingSupport)
-      .withDebugMetadata(options.nativeConfig.debugMetadata)
+      .withSourceLevelDebuggingConfig(
+        _.enabled(options.nativeConfig.debugMetadata)
+      )
   }
 
   private def generateOptimizerConfig(

cli/src/test/scala/scala/scalanative/cli/utils/ConfigConverterTest.scala

@@ -230,7 +230,9 @@ class ConfigConverterTest extends AnyFlatSpec {
       fail(_),
       { case (positive, negative) =>
         assert(positive.multithreadingSupport != negative.multithreadingSupport)
-        assert(positive.debugMetadata != negative.debugMetadata)
+        assert(
+          positive.sourceLevelDebuggingConfig.enabled != negative.sourceLevelDebuggingConfig.enabled
+        )
       }
     )
   }