Fix mimalloc patching

Author: hjyamauchi

utils/build.ps1

@@ -191,9 +191,9 @@ if ($PinnedBuild -eq "") {
       $PinnedVersion = "6.0.3"
     }
     "ARM64" {
-      $PinnedBuild = "https://download.swift.org/swift-6.0.3-release/windows10-arm64/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-windows10-arm64.exe"
+      $PinnedBuild = "https://download.swift.org/installer-arm64.exe"
       $PinnedSHA256 = "81474651E59A9955C9E6A389EF53ABD61631FFC62C63A2A02977271019E7C722"
-      $PinnedVersion = "6.0.3"
+      $PinnedVersion = "6.0.0"
     }
     default { throw "Unsupported processor architecture" }
   }
@@ -557,6 +557,7 @@ function Invoke-Program() {
     [string] $Executable,
     [switch] $OutNull = $false,
     [string] $OutFile = "",
+    [string] $ErrorFile = "",
     [Parameter(Position = 1, ValueFromRemainingArguments)]
     [string[]] $Args
   )
@@ -588,13 +589,20 @@ function Invoke-Program() {
     } elseif ("" -ne $OutFile) {
       $OutputLine += " > `"$OutFile`""
     }
+    if ("" -ne $ErrorFile) {
+      $OutputLine += " > `"$ErrorFile`""
+    }
 
     Write-Output $OutputLine
   } else {
     if ($OutNull) {
       & $Executable @Args | Out-Null
+    } elseif ("" -ne $OutFile -and "" -ne $ErrorFile) {
+      & $Executable @Args > $OutFile 2> $ErrorFile
     } elseif ("" -ne $OutFile) {
-      & $Executable @Args | Out-File -Encoding UTF8 $OutFile
+      & $Executable @Args > $OutFile
+    } elseif ("" -ne $ErrorFile) {
+      & $Executable @Args 2> $ErrorFile
     } else {
       & $Executable @Args
     }
@@ -1811,9 +1819,17 @@ function Build-mimalloc() {
   foreach ($Tool in $Tools) {
     $Binary = [IO.Path]::Combine($Arch.ToolchainInstallRoot, "usr", "bin", $Tool)
     # Binary-patch in place
-    Start-Process -Wait -WindowStyle Hidden -FilePath "$SourceCache\mimalloc\bin\minject$BuildSuffix" -ArgumentList @("-f", "-i", "-v", "$Binary")
+    Invoke-Program "$SourceCache\mimalloc\bin\minject$BuildSuffix" "-f" "-i" "-v" "$Binary"
     # Log the import table
-    Start-Process -Wait -WindowStyle Hidden -FilePath "$SourceCache\mimalloc\bin\minject$BuildSuffix" -ArgumentList @("-l", "$Binary")
+    $LogFile = "$BinaryCache\$($Arch.LLVMTarget)\mimalloc\minject-log-$Tool.txt"
+    $ErrorFile = "$BinaryCache\$($Arch.LLVMTarget)\mimalloc\minject-log-$Tool-error.txt"
+    Invoke-Program "$SourceCache\mimalloc\bin\minject$BuildSuffix" "-l" "$Binary" -OutFile $LogFile 2> $ErrorFile
+    # Verify patching
+    $Found = Select-String -Path $LogFile -Pattern "mimalloc"
+    if (-not $Found) {
+      Get-Content $ErrorFile
+      throw "Failed to patch mimalloc for $Tool"
+    }
   }
 }