Resolve remaining PR merge conflicts

Co-authored-by: alexreinking <169273+alexreinking@users.noreply.github.com>

Author: Copilot

.github/workflows/pre-commit-push-fixes.yml

@@ -12,9 +12,7 @@ jobs:
   push-fixes:
     name: Push auto-fixes to PR branch
     runs-on: ubuntu-slim
-    if: >-
-      github.event.workflow_run.event == 'pull_request'
-      && github.event.workflow_run.conclusion == 'failure'
+    if: github.event.workflow_run.conclusion == 'failure'
     steps:
       - name: Download auto-fix artifacts
         id: download
@@ -29,16 +27,12 @@ jobs:
       - name: Read PR metadata
         if: steps.download.outcome == 'success'
         id: pr
-        env:
-          GH_TOKEN: ${{ github.token }}
-          PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
         run: |
-          pr_json="$(gh api repos/${{ github.repository }}/pulls/${PR_NUMBER})"
           {
-            echo "number=${PR_NUMBER}"
-            echo "head-repo=$(jq -r '.head.repo.full_name' <<<"${pr_json}")"
-            echo "head-ref=$(jq -r '.head.ref' <<<"${pr_json}")"
-            echo "maintainer-can-modify=$(jq -r '.maintainer_can_modify' <<<"${pr_json}")"
+            echo "number=$(jq -r '.number' /tmp/pre-commit-fixes/pr-metadata.json)"
+            echo "head-repo=$(jq -r '.head_repo' /tmp/pre-commit-fixes/pr-metadata.json)"
+            echo "head-ref=$(jq -r '.head_ref' /tmp/pre-commit-fixes/pr-metadata.json)"
+            echo "maintainer-can-modify=$(jq -r '.maintainer_can_modify' /tmp/pre-commit-fixes/pr-metadata.json)"
           } >> "$GITHUB_OUTPUT"
 
       - name: Abort if maintainer edits not allowed
@@ -64,21 +58,15 @@ jobs:
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
 
-      - name: Fetch PR branch
+      - uses: actions/checkout@v4
         if: steps.download.outcome == 'success' && env.skip != 'true'
-        env:
-          HEAD_REPO: ${{ steps.pr.outputs.head-repo }}
-          HEAD_REF: ${{ steps.pr.outputs.head-ref }}
-        run: |
-          git init .
-          git remote add origin "https://github.com/${HEAD_REPO}.git"
-          git -c advice.detachedHead=false fetch --depth=1 origin "refs/heads/${HEAD_REF}"
-          git checkout --detach FETCH_HEAD
+        with:
+          repository: ${{ steps.pr.outputs.head-repo }}
+          ref: ${{ steps.pr.outputs.head-ref }}
+          token: ${{ steps.app-token.outputs.token }}
 
       - name: Apply and push fixes
         if: steps.download.outcome == 'success' && env.skip != 'true'
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
           git config user.name "${{ steps.app-token.outputs.app-slug }}[bot]"
           git config user.email "${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com"
@@ -91,5 +79,4 @@ jobs:
           git apply /tmp/pre-commit-fixes/pre-commit-fixes.patch
           git add -A
           git commit -m "Apply pre-commit auto-fixes"
-          git remote set-url --push origin "https://x-access-token:${GH_TOKEN}@github.com/${{ steps.pr.outputs.head-repo }}.git"
-          git push origin HEAD:${{ steps.pr.outputs.head-ref }}
+          git push

test/correctness/simplify.cpp

@@ -811,10 +811,6 @@ void check_vectors() {
           int_vector);
     check(VectorReduce::make(VectorReduce::Max, Broadcast::make(int_vector, 4), 8),
           VectorReduce::make(VectorReduce::Max, Broadcast::make(int_vector, 4), 8));
-    check(cast(UInt(32, 2),
-               VectorReduce::make(VectorReduce::Max, Ramp::make(cast(UInt(8), x), cast(UInt(8), y), 8), 2)),
-          cast(UInt(32, 2),
-               VectorReduce::make(VectorReduce::Max, Ramp::make(cast(UInt(8), x), cast(UInt(8), y), 8), 2)));
 
     {
         // h_add(broadcast(x, 8), 4) should simplify to broadcast(x * 2, 4)
@@ -824,17 +820,20 @@ void check_vectors() {
 
     {
         Expr const_u8 = cast(UInt(8), 3);
-        check(VectorReduce::make(VectorReduce::Add, broadcast(const_u8, 9), 3),
-              broadcast(cast(UInt(8), 9), 3));
+        check(VectorReduce::make(VectorReduce::Add, broadcast(const_u8, 9), 3), broadcast(cast(UInt(8), 9), 3));
     }
 
     {
         // Test VectorReduce::Add on a variable of unsigned type to ensure the multiplied factor
         // keeps the correct type and avoids type-mismatch assertion failures.
         Expr u8_x = Variable::make(UInt(8), "u8_x");
-        check(VectorReduce::make(VectorReduce::Add, broadcast(u8_x, 9), 3),
-              broadcast(u8_x * cast(UInt(8), 3), 3));
+        check(VectorReduce::make(VectorReduce::Add, broadcast(u8_x, 9), 3), broadcast(u8_x * cast(UInt(8), 3), 3));
     }
+
+    check(cast(UInt(32, 2),
+               VectorReduce::make(VectorReduce::Max, Ramp::make(cast(UInt(8), x), cast(UInt(8), y), 8), 2)),
+          cast(UInt(32, 2),
+               VectorReduce::make(VectorReduce::Max, Ramp::make(cast(UInt(8), x), cast(UInt(8), y), 8), 2)));
 }
 
 void check_bounds() {