Merge pull request #79716 from hjyamauchi/mimallocpatching

Fix mimalloc patching

Author: hjyamauchi

utils/build.ps1

@@ -577,6 +577,7 @@ function Invoke-Program() {
     [string] $Executable,
     [switch] $OutNull = $false,
     [string] $OutFile = "",
+    [string] $ErrorFile = "",
     [Parameter(Position = 1, ValueFromRemainingArguments)]
     [string[]] $Args
   )
@@ -605,16 +606,23 @@ function Invoke-Program() {
 
     if ($OutNull) {
       $OutputLine += " > nul"
-    } elseif ("" -ne $OutFile) {
+    } elseif ($OutFile) {
       $OutputLine += " > `"$OutFile`""
     }
+    if ($ErrorFile) {
+      $OutputLine += " 2> `"$ErrorFile`""
+    }
 
     Write-Output $OutputLine
   } else {
     if ($OutNull) {
       & $Executable @Args | Out-Null
-    } elseif ("" -ne $OutFile) {
-      & $Executable @Args | Out-File -Encoding UTF8 $OutFile
+    } elseif ($OutFile -and $ErrorFile) {
+      & $Executable @Args > $OutFile 2> $ErrorFile
+    } elseif ($OutFile) {
+      & $Executable @Args > $OutFile
+    } elseif ($ErrorFile) {
+      & $Executable @Args 2> $ErrorFile
     } else {
       & $Executable @Args
     }
@@ -1822,9 +1830,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 -ErrorFile $ErrorFile
+    # Verify patching
+    $Found = Select-String -Path $LogFile -Pattern "mimalloc"
+    if (-not $Found) {
+      Get-Content $ErrorFile
+      throw "Failed to patch mimalloc for $Tool"
+    }
   }
 }