fix: move BrowserWindow's WebContentsView to be a child of rootview (#41802)

fix: move BrowserWindow's WebContentsView to be a child of rootview (#41256)

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <jeremya@chromium.org>

.circleci/config/base.yml

@@ -33,7 +33,7 @@ parameters:
   macos-publish-arch-limit:
     type: enum
     default: all
-    enum: ["all", "osx-arm64", "mas-arm64"]
+    enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
 
   medium-linux-executor:
     type: enum
@@ -64,7 +64,7 @@ executors:
       size:
         description: "macOS executor size"
         type: enum
-        enum: ["macos.m1.large.gen1", "macos.m1.medium.gen1"]
+        enum: ["macos.x86.medium.gen2", "macos.m1.large.gen1", "macos.m1.medium.gen1"]
       version:
         description: "xcode version"
         type: enum
@@ -260,9 +260,9 @@ step-depot-tools-get: &step-depot-tools-get
       index c305c248..e6e0fbdc 100755
       --- a/gclient.py
       +++ b/gclient.py
-      @@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
-                               not condition or "non_git_source" not in condition):
-                           continue
+      @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
+ 
+                   if dep_type == 'cipd':
                        cipd_root = self.GetCipdRoot()
       -                for package in dep_value.get('packages', []):
       +                packages = dep_value.get('packages', [])
@@ -1638,6 +1638,8 @@ commands:
             fi
       - store_test_results:
           path: src/junit
+      - store_artifacts:
+          path: src/electron/spec/artifacts
 
       - *step-verify-mksnapshot
       - *step-verify-chromedriver
@@ -1808,6 +1810,26 @@ jobs:
           build-type: 'nil'
           could-be-aks: false
 
+  mac-make-src-cache-x64:
+    executor:
+      name: linux-docker
+      size: xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-testing-build
+      <<: *env-macos-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          save-git-cache: true
+          checkout-to-create-src-cache: true
+          artifact-key: 'nil'
+          build-type: 'nil'
+          could-be-aks: false
+
   mac-make-src-cache-arm64:
     executor:
       name: linux-docker
@@ -2007,6 +2029,76 @@ jobs:
                 checkout: true
                 build-type: 'Linux ARM64'
 
+  osx-testing-x64:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-mac-large
+      <<: *env-testing-build
+      <<: *env-ninja-status
+      <<: *env-macos-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: false
+          checkout-and-assume-cache: true
+          attach: true
+          artifact-key: 'darwin-x64'
+          build-type: 'Darwin'
+          after-build-and-save:
+            - run:
+                name: Configuring MAS build
+                command: |
+                  echo 'export GN_EXTRA_ARGS="is_mas_build = true $GN_EXTRA_ARGS"' >> $BASH_ENV
+                  echo 'export MAS_BUILD="true"' >> $BASH_ENV
+                  rm -rf "src/out/Default/Electron Framework.framework"
+                  rm -rf src/out/Default/Electron*.app
+            - build_and_save_artifacts:
+                artifact-key: 'mas-x64'
+                build-type: 'MAS'
+          after-persist:
+            - persist_to_workspace:
+                root: .
+                paths:
+                  - generated_artifacts_mas-x64
+          could-be-aks: false
+
+  osx-testing-x64-gn-check:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-machine-mac
+      <<: *env-testing-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - run-gn-check:
+          could-be-aks: false
+
+  osx-publish-x64:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-mac-large-release
+      <<: *env-release-build
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      <<: *env-ninja-status
+    steps:
+      - run: echo running
+      - when:
+          condition:
+            or:
+              - equal: ["all", << pipeline.parameters.macos-publish-arch-limit >>]
+              - equal: ["osx-x64", << pipeline.parameters.macos-publish-arch-limit >>]
+          steps:
+            - electron-publish:
+                attach: true
+                checkout: false
+                build-type: 'Darwin'
+
   osx-publish-arm64:
     executor:
       name: macos
@@ -2067,6 +2159,28 @@ jobs:
                   - generated_artifacts_mas-arm64
           could-be-aks: false
 
+  mas-publish-x64:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-mac-large-release
+      <<: *env-mas
+      <<: *env-release-build
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+    steps:
+      - run: echo running
+      - when:
+          condition:
+            or:
+              - equal: ["all", << pipeline.parameters.macos-publish-arch-limit >>]
+              - equal: ["mas-x64", << pipeline.parameters.macos-publish-arch-limit >>]
+          steps:
+            - electron-publish:
+                attach: true
+                checkout: false
+                build-type: 'MAS'
+
   mas-publish-arm64:
     executor:
       name: macos
@@ -2167,6 +2281,19 @@ jobs:
       - electron-tests:
           artifact-key: linux-arm64
 
+  darwin-testing-x64-tests:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+      version: 14.0.0
+    environment:
+      <<: *env-mac-large
+      <<: *env-stack-dumping
+    parallelism: 2
+    steps:
+      - electron-tests:
+          artifact-key: darwin-x64
+
   darwin-testing-arm64-tests:    
     executor:
       name: macos
@@ -2180,6 +2307,19 @@ jobs:
       - electron-tests:
           artifact-key: darwin-arm64
 
+  mas-testing-x64-tests:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+      version: 14.0.0
+    environment:
+      <<: *env-mac-large
+      <<: *env-stack-dumping
+    parallelism: 2
+    steps:
+      - electron-tests:
+          artifact-key: mas-x64
+
   mas-testing-arm64-tests:
     executor:
       name: macos
@@ -2214,6 +2354,27 @@ workflows:
     - linux-arm64-publish:
         context: release-env
 
+  publish-macos:
+    when: << pipeline.parameters.run-macos-publish >>
+    jobs:
+    - mac-checkout
+    - osx-publish-x64:
+        requires:
+          - mac-checkout
+        context: release-env
+    - mas-publish-x64:
+        requires:
+          - mac-checkout
+        context: release-env
+    - osx-publish-arm64:
+        requires:
+          - mac-checkout
+        context: release-env
+    - mas-publish-arm64:
+        requires:
+          - mac-checkout
+        context: release-env
+
   build-linux:
     when:
       and:
@@ -2274,7 +2435,17 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-mac >>]
     jobs:
+      - mac-make-src-cache-x64
       - mac-make-src-cache-arm64
+      - osx-testing-x64:
+          requires:
+            - mac-make-src-cache-x64
+      - osx-testing-x64-gn-check:
+          requires:
+            - mac-make-src-cache-x64
+      - darwin-testing-x64-tests:
+          requires:
+            - osx-testing-x64
       - osx-testing-arm64:
           requires:
             - mac-make-src-cache-arm64
@@ -2285,6 +2456,9 @@ workflows:
               ignore: /pull\/[0-9]+/
           requires:
             - osx-testing-arm64
+      - mas-testing-x64-tests:
+          requires:
+            - osx-testing-x64
       - mas-testing-arm64-tests:
           filters:
             branches:

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:
+  - name: Discord Chat
+    url: https://discord.gg/APGC3k5yaH
+    about: Have questions? Try asking on our Discord - this issue tracker is for reporting bugs or feature requests only
+  - name: Open Collective
+    url: https://opencollective.com/electron
+    about: Help support Electron by contributing to our Open Collective

.github/actions/build-electron/action.yml

@@ -1,220 +0,0 @@
-name: 'Build Electron'
-description: 'Builds Electron & Friends'
-inputs:
-  target-arch:
-    description: 'Target arch'
-    required: true
-  target-platform:
-    description: 'Target platform'
-    required: true
-  artifact-platform:
-    description: 'Artifact platform, should be linux, darwin or mas'
-    required: true
-  step-suffix:
-    description: 'Suffix for build steps'
-    required: false
-    default: ''
-  is-release:
-    description: 'Is release build'
-    required: true
-  strip-binaries:
-    description: 'Strip binaries (Linux only)'
-    required: false
-  generate-symbols:
-    description: 'Generate symbols'
-    required: true
-  upload-to-storage:
-    description: 'Upload to storage'
-    required: true
-  is-asan:
-    description: 'The ASan Linux build'
-    required: false
-runs:
-  using: "composite"
-  steps:
-    - name: Set GN_EXTRA_ARGS for MacOS x64 Builds
-      shell: bash
-      if: ${{ inputs.target-arch == 'x64' && inputs.target-platform == 'macos' }}
-      run: |
-        GN_APPENDED_ARGS="$GN_EXTRA_ARGS v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\""
-        echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV
-    - name: Build Electron ${{ inputs.step-suffix }}
-      shell: bash
-      run: |
-        rm -rf "src/out/Default/Electron Framework.framework"
-        rm -rf src/out/Default/Electron*.app
-
-        cd src/electron
-        # TODO(codebytere): remove this once we figure out why .git/packed-refs is initially missing
-        git pack-refs
-        cd ..
-
-        if [ "`uname`" = "Darwin" ]; then
-          ulimit -n 10000
-          sudo launchctl limit maxfiles 65536 200000
-        fi
-
-        NINJA_SUMMARIZE_BUILD=1 e build -j $NUMBER_OF_NINJA_PROCESSES
-        cp out/Default/.ninja_log out/electron_ninja_log
-        node electron/script/check-symlinks.js
-    - name: Strip Electron Binaries ${{ inputs.step-suffix }}
-      shell: bash
-      if: ${{ inputs.strip-binaries == 'true' }}
-      run: |
-        cd src
-        electron/script/copy-debug-symbols.py --target-cpu="${{ inputs.target-arch }}" --out-dir=out/Default/debug --compress
-        electron/script/strip-binaries.py --target-cpu="${{ inputs.target-arch }}"
-        electron/script/add-debug-link.py --target-cpu="${{ inputs.target-arch }}" --debug-dir=out/Default/debug
-    - name: Build Electron dist.zip ${{ inputs.step-suffix }}
-      shell: bash
-      run: |
-        cd src
-        e build electron:electron_dist_zip -j $NUMBER_OF_NINJA_PROCESSES
-        if [ "${{ inputs.is-asan }}" != "true" ]; then
-          target_os=${{ inputs.target-platform == 'linux' && 'linux' || 'mac'}}
-          if [ "${{ inputs.artifact-platform }}" = "mas" ]; then
-            target_os="${target_os}_mas"
-          fi
-          electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.${{ inputs.target-arch }}.manifest
-        fi
-    - name: Build Mksnapshot ${{ inputs.step-suffix }}
-      shell: bash
-      run: |
-        cd src
-        e build electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
-        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-        # Remove unused args from mksnapshot_args
-        SEDOPTION="-i"
-        if [ "`uname`" = "Darwin" ]; then
-          SEDOPTION="-i ''"
-        fi
-        sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
-        sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
-        sed $SEDOPTION '/The gn arg use_goma=true .*/d' out/Default/mksnapshot_args
-
-        if [ "`uname`" = "Linux" ]; then
-          if [ "${{ inputs.target-arch }}" = "arm" ]; then
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/v8_context_snapshot_generator
-          elif [ "${{ inputs.target-arch }}" = "arm64" ]; then
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/mksnapshot
-            electron/script/strip-binaries.py --file $PWD/out/Default/clang_x64_v8_arm64/v8_context_snapshot_generator
-          else
-            electron/script/strip-binaries.py --file $PWD/out/Default/mksnapshot
-            electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
-          fi
-        fi
-
-        e build electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
-        (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
-    - name: Generate Cross-Arch Snapshot (arm/arm64)  ${{ inputs.step-suffix }}
-      shell: bash
-      if: ${{ (inputs.target-arch == 'arm' || inputs.target-arch == 'arm64') && inputs.target-platform == 'linux' }}
-      run: |
-        cd src
-        if [ "${{ inputs.target-arch }}" = "arm" ]; then
-          MKSNAPSHOT_PATH="clang_x86_v8_arm"
-        elif [ "${{ inputs.target-arch }}" = "arm64" ]; then
-          MKSNAPSHOT_PATH="clang_x64_v8_arm64"
-        fi
-
-        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default
-        cp "out/Default/$MKSNAPSHOT_PATH/v8_context_snapshot_generator" out/Default
-        cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default
-
-        python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
-        mkdir cross-arch-snapshots
-        cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
-        # Clean up so that ninja does not get confused
-        rm -f out/Default/libffmpeg.so
-    - name: Build Chromedriver ${{ inputs.step-suffix }}
-      shell: bash
-      run: |
-        cd src
-        e build electron:electron_chromedriver -j $NUMBER_OF_NINJA_PROCESSES
-        e build electron:electron_chromedriver_zip
-    - name: Build Node.js headers ${{ inputs.step-suffix }}
-      shell: bash
-      run: |
-        cd src
-        e build electron:node_headers
-    - name: Generate & Zip Symbols ${{ inputs.step-suffix }}
-      shell: bash
-      run: |
-        # Generate breakpad symbols on release builds
-        if [ "${{ inputs.generate-symbols }}" = "true" ]; then
-          e build electron:electron_symbols
-        fi
-        cd src
-        export BUILD_PATH="$(pwd)/out/Default"
-        e build electron:licenses
-        e build electron:electron_version_file
-        if [ "${{ inputs.is-release }}" = "true" ]; then
-          DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH
-        else
-          electron/script/zip-symbols.py -b $BUILD_PATH
-        fi
-    - name: Generate FFMpeg ${{ inputs.step-suffix }}
-      shell: bash
-      if: ${{ inputs.is-release == 'true' }}
-      run: |
-        cd src
-        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS"
-        autoninja -C out/ffmpeg electron:electron_ffmpeg_zip -j $NUMBER_OF_NINJA_PROCESSES
-    - name: Generate Hunspell Dictionaries ${{ inputs.step-suffix }}
-      shell: bash
-      if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }}
-      run: |
-        cd src
-        autoninja -C out/Default electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES
-    - name: Generate Libcxx ${{ inputs.step-suffix }}
-      shell: bash
-      if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }}
-      run: |
-        cd src
-        autoninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        autoninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        autoninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
-    - name: Generate TypeScript Definitions ${{ inputs.step-suffix }}
-      if: ${{ inputs.is-release == 'true' }}
-      shell: bash
-      run: |
-        cd src/electron
-        node script/yarn create-typescript-definitions
-    - name: Publish Electron Dist ${{ inputs.step-suffix }}
-      if: ${{ inputs.is-release == 'true' }}
-      shell: bash
-      run: |
-        rm -rf src/out/Default/obj
-        cd src/electron
-        if [ "${{ inputs.upload-to-storage }}" = "1" ]; then
-          echo 'Uploading Electron release distribution to Azure'
-          script/release/uploaders/upload.py --verbose --upload_to_storage
-        else
-          echo 'Uploading Electron release distribution to GitHub releases'
-          script/release/uploaders/upload.py --verbose
-        fi
-    - name: Generate Artifact Key
-      shell: bash
-      run: |
-        if [ "${{ inputs.is-asan }}" = "true" ]; then 
-          ARTIFACT_KEY=${{ inputs.artifact-platform }}_${{ inputs.target-arch }}_asan
-        else
-          ARTIFACT_KEY=${{ inputs.artifact-platform }}_${{ inputs.target-arch }}
-        fi
-        echo "ARTIFACT_KEY=$ARTIFACT_KEY" >> $GITHUB_ENV
-    # The current generated_artifacts_<< artifact.key >> name was taken from CircleCI
-    # to ensure we don't break anything, but we may be able to improve that.
-    - name: Move all Generated Artifacts to Upload Folder ${{ inputs.step-suffix }}
-      shell: bash
-      run: ./src/electron/script/actions/move-artifacts.sh
-    - name: Upload Generated Artifacts ${{ inputs.step-suffix }}
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
-      with:
-        name: generated_artifacts_${{ env.ARTIFACT_KEY }}
-        path: ./generated_artifacts_${{ inputs.artifact-platform }}_${{ inputs.target-arch }}
-    - name: Upload Src Artifacts ${{ inputs.step-suffix }}
-      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
-      with:
-        name: src_artifacts_${{ env.ARTIFACT_KEY }}
-        path: ./src_artifacts_${{ inputs.artifact-platform }}_${{ inputs.target-arch }}

.github/actions/checkout/action.yml

@@ -1,154 +0,0 @@
-name: 'Checkout'
-description: 'Checks out Electron and stores it in the AKS Cache'
-inputs:
-  generate-sas-token:
-    description: 'Whether to generate and persist a SAS token for the item in the cache'
-    required: false
-    default: 'false'
-runs:
-  using: "composite"
-  steps:
-  - name: Set GIT_CACHE_PATH to make gclient to use the cache
-    shell: bash
-    run: |
-      echo "GIT_CACHE_PATH=$(pwd)/git-cache" >> $GITHUB_ENV
-  - name: Install Dependencies
-    shell: bash
-    run: |
-      cd src/electron
-      node script/yarn install --frozen-lockfile
-  - name: Get Depot Tools
-    shell: bash
-    run: |
-      git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-
-      sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-      # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-      cd depot_tools
-      git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-
-      # Ensure depot_tools does not update.
-      test -d depot_tools && cd depot_tools
-      touch .disable_auto_update
-  - name: Add Depot Tools to PATH
-    shell: bash
-    run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-  - name: Generate DEPS Hash
-    shell: bash
-    run: |
-      node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
-      echo "DEPSHASH=v1-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')" >> $GITHUB_ENV
-  - name: Generate SAS Key
-    if: ${{ inputs.generate-sas-token == 'true' }}
-    shell: bash
-    run: |
-      curl --unix-socket /var/run/sas/sas.sock --fail "http://foo/$DEPSHASH.tar" > sas-token
-  - name: Save SAS Key
-    if: ${{ inputs.generate-sas-token == 'true' }}
-    uses: actions/cache/save@v4
-    with:
-      path: |
-        sas-token
-      key: sas-key-${{ github.run_number }}-${{ github.run_attempt }}
-  - name: Check If Cache Exists
-    id: check-cache
-    shell: bash
-    run: |
-      cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
-      echo "Using cache key: $DEPSHASH"
-      echo "Checking for cache in: $cache_path"
-      if [ ! -f "$cache_path" ]; then
-        echo "cache_exists=false" >> $GITHUB_OUTPUT
-        echo "Cache Does Not Exist for $DEPSHASH"
-      else
-        echo "cache_exists=false" >> $GITHUB_OUTPUT
-        echo "Cache Already Exists for $DEPSHASH, Busting Cache.."
-      fi
-  - name: Gclient Sync
-    if: steps.check-cache.outputs.cache_exists == 'false'
-    shell: bash
-    run: |
-      gclient config \
-        --name "src/electron" \
-        --unmanaged \
-        ${GCLIENT_EXTRA_ARGS} \
-        "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
-
-      ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags -vvvvv
-      if [ "${{ inputs.is-release }}" != "true" ]; then
-        # Re-export all the patches to check if there were changes.
-        python3 src/electron/script/export_all_patches.py src/electron/patches/config.json
-        cd src/electron
-        git update-index --refresh || true
-        if ! git diff-index --quiet HEAD --; then
-          # There are changes to the patches. Make a git commit with the updated patches
-          git add patches
-          GIT_COMMITTER_NAME="PatchUp" GIT_COMMITTER_EMAIL="73610968+patchup[bot]@users.noreply.github.com" git commit -m "chore: update patches" --author="PatchUp <73610968+patchup[bot]@users.noreply.github.com>"
-          # Export it
-          mkdir -p ../../patches
-          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-          if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
-            echo
-            echo "======================================================================"
-            echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
-            echo "A new CI job will kick off shortly"
-            echo "======================================================================"
-            exit 1
-          else
-            echo
-            echo "======================================================================"
-            echo "There were changes to the patches when applying."
-            echo "Check the CI artifacts for a patch you can apply to fix it."
-            echo "======================================================================"
-            exit 1
-          fi
-        fi
-      fi
-
-  # delete all .git directories under src/ except for
-  # third_party/angle/ and third_party/dawn/ because of build time generation of files
-  # gen/angle/commit.h depends on third_party/angle/.git/HEAD
-  # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-  # and dawn/common/Version_autogen.h depends on  third_party/dawn/.git/HEAD
-  # https://dawn-review.googlesource.com/c/dawn/+/83901
-  # TODO: maybe better to always leave out */.git/HEAD file for all targets ?
-  - name: Delete .git directories under src to free space
-    if: steps.check-cache.outputs.cache_exists == 'false'
-    shell: bash
-    run: |
-      cd src
-      ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" -not -path "./electron/*" ) | xargs rm -rf
-  - name: Minimize Cache Size for Upload
-    if: steps.check-cache.outputs.cache_exists == 'false'
-    shell: bash
-    run: |
-      rm -rf src/android_webview
-      rm -rf src/ios/chrome
-      rm -rf src/third_party/blink/web_tests
-      rm -rf src/third_party/blink/perf_tests
-      rm -rf src/chrome/test/data/xr/webvr_info
-      rm -rf src/third_party/angle/third_party/VK-GL-CTS/src
-      rm -rf src/third_party/swift-toolchain
-      rm -rf src/third_party/swiftshader/tests/regres/testlists
-      rm -rf src/electron
-  - name: Compress Src Directory
-    if: steps.check-cache.outputs.cache_exists == 'false'
-    shell: bash
-    run: |
-      echo "Uncompressed src size: $(du -sh src | cut -f1 -d' ')"
-      tar -cf $DEPSHASH.tar src
-      echo "Compressed src to $(du -sh $DEPSHASH.tar | cut -f1 -d' ')"
-      cp ./$DEPSHASH.tar /mnt/cross-instance-cache/
-  - name: Persist Src Cache
-    if: steps.check-cache.outputs.cache_exists == 'false'
-    shell: bash
-    run: |
-      final_cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
-      echo "Using cache key: $DEPSHASH"
-      echo "Checking path: $final_cache_path"
-      if [ ! -f "$final_cache_path" ]; then
-        echo "Cache key not found"
-        exit 1
-      else
-        echo "Cache key persisted in $final_cache_path"
-      fi

.github/actions/fix-sync/action.yml

@@ -1,71 +0,0 @@
-name: 'Fix Sync'
-description: 'Checks out Electron and stores it in the AKS Cache'
-inputs:
-  target-arch:
-    description: 'Target arch'
-    required: true
-  target-platform:
-    description: 'Target platform'
-    required: true
-runs:
-  using: "composite"
-  steps:
-    - name: Fix Sync
-      shell: bash
-      # This step is required to correct for differences between "gclient sync"
-      # on Linux and the expected state. This requires:
-      # 1. Fixing Clang Install (wrong binary)
-      # 2. Fixing esbuild (wrong binary)
-      # 3. Fixing rustc (wrong binary)
-      # 4. Fixing gn (wrong binary)
-      # 5. Fix reclient (wrong binary)
-      # 6. Fixing dsymutil (wrong binary)
-      # 7. Ensuring we are using the correct ninja and adding it to PATH
-      # 8. Fixing angle (wrong remote)
-      run : |
-        SEDOPTION="-i"
-        if [ "${{ inputs.target-platform }}" = "macos" ]; then
-          SEDOPTION="-i ''"
-          rm -rf src/third_party/llvm-build
-          python3 src/tools/clang/scripts/update.py
-
-          echo 'infra/3pp/tools/esbuild/${platform}' `gclient getdep --deps-file=src/third_party/devtools-frontend/src/DEPS -r 'third_party/esbuild:infra/3pp/tools/esbuild/${platform}'` > esbuild_ensure_file
-          # Remove extra output from calling gclient getdep which always calls update_depot_tools
-          sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file
-          cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
-
-          rm -rf src/third_party/rust-toolchain
-          python3 src/tools/rust/update_rust.py
-          
-          # Prevent calling gclient getdep which always calls update_depot_tools
-          echo 'gn/gn/mac-${arch}' `gclient getdep --deps-file=src/DEPS -r 'src/buildtools/mac:gn/gn/mac-${arch}'` > gn_ensure_file
-          sed -i '' "s/Updating depot_tools... //g" gn_ensure_file
-          cipd ensure --root src/buildtools/mac -ensure-file gn_ensure_file
-
-          # Prevent calling gclient getdep which always calls update_depot_tools
-          echo 'infra/rbe/client/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/buildtools/reclient:infra/rbe/client/${platform}'` > gn_ensure_file
-          sed -i '' "s/Updating depot_tools... //g" gn_ensure_file
-          cipd ensure --root src/buildtools/reclient -ensure-file gn_ensure_file
-          python3 src/buildtools/reclient_cfgs/configure_reclient_cfgs.py --rbe_instance "projects/rbe-chrome-untrusted/instances/default_instance" --reproxy_cfg_template reproxy.cfg.template --rewrapper_cfg_project "" --skip_remoteexec_cfg_fetch
-
-          if  [ "${{ inputs.target-arch }}" == "arm64" ]; then
-            DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1
-          else
-            DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.x64.sha1
-          fi
-          python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil
-        fi
-
-        echo 'infra/3pp/tools/ninja/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/tools/ninja/${platform}'` > ninja_ensure_file
-        sed $SEDOPTION "s/Updating depot_tools... //g" ninja_ensure_file
-        cipd ensure --root src/third_party/ninja -ensure-file ninja_ensure_file
-
-        echo "$(pwd)/src/third_party/ninja" >> $GITHUB_PATH
-
-        cd src/third_party/angle
-        rm -f .git/objects/info/alternates
-        git remote set-url origin https://chromium.googlesource.com/angle/angle.git
-        cp .git/config .git/config.backup
-        git remote remove origin
-        mv .git/config.backup .git/config
-        git fetch

.github/actions/free-space-macos/action.yml

@@ -1,65 +0,0 @@
-name: 'Free Space macOS'
-description: 'Checks out Electron and stores it in the AKS Cache'
-runs:
-  using: "composite"
-  steps:
-    - name: Free Space on MacOS
-      shell: bash
-      run: |
-        sudo mkdir -p $TMPDIR/del-target
-
-        tmpify() {
-          if [ -d "$1" ]; then
-            sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
-          fi
-        }
-
-        strip_universal_deep() {
-          opwd=$(pwd)
-          cd $1
-          f=$(find . -perm +111 -type f)
-          for fp in $f
-          do
-            if [[ $(file "$fp") == *"universal binary"* ]]; then
-              if [ "`arch`" == "arm64" ]; then
-                if [[ $(file "$fp") == *"x86_64"* ]]; then
-                  sudo lipo -remove x86_64 "$fp" -o "$fp" || true
-                fi
-              else
-                if [[ $(file "$fp") == *"arm64e)"* ]]; then
-                  sudo lipo -remove arm64e "$fp" -o "$fp" || true
-                fi
-                if [[ $(file "$fp") == *"arm64)"* ]]; then
-                  sudo lipo -remove arm64 "$fp" -o "$fp" || true
-                fi
-              fi
-            fi
-          done
-
-          cd $opwd
-        }
-
-        tmpify /Library/Developer/CoreSimulator
-        tmpify ~/Library/Developer/CoreSimulator
-        tmpify $(xcode-select -p)/Platforms/AppleTVOS.platform
-        tmpify $(xcode-select -p)/Platforms/iPhoneOS.platform
-        tmpify $(xcode-select -p)/Platforms/WatchOS.platform
-        tmpify $(xcode-select -p)/Platforms/WatchSimulator.platform
-        tmpify $(xcode-select -p)/Platforms/AppleTVSimulator.platform
-        tmpify $(xcode-select -p)/Platforms/iPhoneSimulator.platform
-        tmpify $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/metal/ios
-        tmpify $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
-        tmpify $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0
-        tmpify ~/.rubies
-        tmpify ~/Library/Caches/Homebrew
-        tmpify /usr/local/Homebrew
-
-        sudo rm -rf $TMPDIR/del-target
-
-        sudo rm -rf /Applications/Safari.app
-        sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
-        sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
-
-        # lipo off some huge binaries arm64 versions to save space
-        strip_universal_deep $(xcode-select -p)/../SharedFrameworks
-        # strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr

.github/actions/install-build-tools/action.yml

@@ -1,11 +0,0 @@
-name: 'Install Build Tools'
-description: 'Installs an exact SHA of build tools'
-runs:
-  using: "composite"
-  steps:
-  - name: Install Build Tools
-    shell: bash
-    run: |
-      export BUILD_TOOLS_SHA=d5b87591842be19058e8d75d2c5b7f1fabe9f450
-      npm i -g @electron/build-tools
-      e auto-update disable

.github/actions/restore-cache-aks/action.yml

@@ -1,36 +0,0 @@
-name: 'Restore Cache AKS'
-description: 'Restores Electron src cache via AKS'
-runs:
-  using: "composite"
-  steps:
-  - name: Restore and Ensure Src Cache
-    shell: bash
-    run: |
-      cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
-      echo "Using cache key: $DEPSHASH"
-      echo "Checking for cache in: $cache_path"
-      if [ ! -f "$cache_path" ]; then
-        echo "Cache Does Not Exist for $DEPSHASH - exiting"
-        exit 1
-      else
-        echo "Found Cache for $DEPSHASH at $cache_path"
-      fi
-
-      echo "Persisted cache is $(du -sh $cache_path | cut -f1)"
-      mkdir temp-cache
-      tar -xf $cache_path -C temp-cache
-      echo "Unzipped cache is $(du -sh temp-cache/src | cut -f1)"
-
-      if [ -d "temp-cache/src" ]; then
-        echo "Relocating Cache"
-        rm -rf src
-        mv temp-cache/src src
-      fi
-
-      if [ ! -d "src/third_party/blink" ]; then
-        echo "Cache was not correctly restored - exiting"
-        exit 1
-      fi
-
-      echo "Wiping Electron Directory"
-      rm -rf src/electron

.github/actions/restore-cache-azcopy/action.yml

@@ -1,66 +0,0 @@
-name: 'Restore Cache AZCopy'
-description: 'Restores Electron src cache via AZCopy'
-runs:
-  using: "composite"
-  steps:
-  - name: Obtain SAS Key
-    continue-on-error: true
-    uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
-    with:
-      path: |
-        sas-token
-      key: sas-key-${{ github.run_number }}-1
-  - name: Obtain SAS Key
-    continue-on-error: true
-    uses: actions/cache/restore@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
-    with:
-      path: |
-        sas-token
-      key: sas-key-${{ github.run_number }}-${{ github.run_attempt }}
-  - name: Download Src Cache from AKS
-    # The cache will always exist here as a result of the checkout job
-    # Either it was uploaded to Azure in the checkout job for this commit
-    # or it was uploaded in the checkout job for a previous commit.
-    uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
-    with:
-      timeout_minutes: 20
-      max_attempts: 3
-      retry_on: error
-      command: |
-        sas_token=$(cat sas-token)
-        if [ -z $sas-token ]; then
-          echo "SAS Token not found; exiting src cache download early..."
-          exit 1
-        fi
-        azcopy copy \
-          "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar
-    env:
-      AZURE_AKS_CACHE_STORAGE_ACCOUNT: f723719aa87a34622b5f7f3
-      AZURE_AKS_CACHE_SHARE_NAME: pvc-f6a4089f-b082-4bee-a3f9-c3e1c0c02d8f
-  - name: Clean SAS Key
-    shell: bash
-    run: rm -f sas-token
-  - name: Unzip and Ensure Src Cache
-    shell: bash
-    run: |
-      echo "Downloaded cache is $(du -sh $DEPSHASH.tar | cut -f1)"
-      mkdir temp-cache
-      tar -xf $DEPSHASH.tar -C temp-cache
-      echo "Unzipped cache is $(du -sh temp-cache/src | cut -f1)"
-
-      if [ -d "temp-cache/src" ]; then
-        echo "Relocating Cache"
-        rm -rf src
-        mv temp-cache/src src
-
-        echo "Deleting zip file"
-        rm -rf $DEPSHASH.tar
-      fi
-
-      if [ ! -d "src/third_party/blink" ]; then
-        echo "Cache was not correctly restored - exiting"
-        exit 1
-      fi
-
-      echo "Wiping Electron Directory"
-      rm -rf src/electron

.github/workflows/branch-created.yml

@@ -1,6 +1,12 @@
 name: Branch Created
 
 on:
+  workflow_dispatch:
+    inputs:
+      branch-name:
+        description: Branch name (e.g. `29-x-y`)
+        required: true
+        type: string
   create:
 
 permissions: {}
@@ -8,7 +14,7 @@ permissions: {}
 jobs:
   release-branch-created:
     name: Release Branch Created
-    if: ${{ github.event.ref_type == 'branch' && endsWith(github.event.ref, '-x-y') && !startsWith(github.event.ref, 'roller') }}
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event.ref_type == 'branch' && endsWith(github.event.ref, '-x-y') && !startsWith(github.event.ref, 'roller')) }}
     permissions:
       contents: read
       pull-requests: write
@@ -18,10 +24,10 @@ jobs:
       - name: Determine Major Version
         id: check-major-version
         run: |
-          if [[ ${{ github.event.ref }} =~ ^([0-9]+)-x-y$ ]]; then
+          if [[ ${{ github.event.inputs.branch-name || github.event.ref }} =~ ^([0-9]+)-x-y$ ]]; then
             echo "MAJOR=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
           else
-            echo "Not a release branch: ${{ github.event.ref }}"
+            echo "Not a release branch: ${{ github.event.inputs.branch-name || github.event.ref }}"
           fi
       - name: New Release Branch Tasks
         if: ${{ steps.check-major-version.outputs.MAJOR }}
@@ -67,7 +73,7 @@ jobs:
           org: electron
       - name: Generate Release Project Board Metadata
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
         id: generate-project-metadata
         with:
           script: |
@@ -86,14 +92,16 @@ jobs:
             }))
       - name: Create Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/copy-project@3a81985616963f32fae17d1d1b406c631f3201a1 # v1.1.0
+        uses: dsanders11/project-actions/copy-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         id: create-release-board
         with:
           drafts: true
           project-number: 64
           # TODO - Set to public once GitHub fixes their GraphQL bug
           # public: true
-          link-to-repository: electron/electron
+          # TODO - Enable once GitHub doesn't require overly broad, read
+          #        and write permission for repo "Contents" to link
+          # link-to-repository: electron/electron
           template-view: ${{ steps.generate-project-metadata.outputs.template-view }}
           title: ${{ steps.generate-project-metadata.outputs.major }}-x-y
           token: ${{ steps.generate-token.outputs.token }}
@@ -104,12 +112,14 @@ jobs:
           GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
       - name: Find Previous Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/find-project@3a81985616963f32fae17d1d1b406c631f3201a1 # v1.1.0
+        uses: dsanders11/project-actions/find-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         id: find-prev-release-board
         with:
           title: ${{ steps.generate-project-metadata.outputs.prev-prev-major }}-x-y
+          token: ${{ steps.generate-token.outputs.token }}
       - name: Close Previous Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/close-project@3a81985616963f32fae17d1d1b406c631f3201a1 # v1.1.0
+        uses: dsanders11/project-actions/close-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         with:
           project-number: ${{ steps.find-prev-release-board.outputs.number }}
+          token: ${{ steps.generate-token.outputs.token }}

.github/workflows/build.yml

@@ -1,245 +0,0 @@
-name: Build
-
-on:
-  workflow_dispatch:
-    inputs:
-      build-image-sha:
-        type: string
-        description: 'SHA for electron/build image'
-        default: 'cf814a4d2501e8e843caea071a6b70a48e78b855'
-        required: true
-      skip-macos:
-        type: boolean
-        description: 'Skip macOS builds'
-        default: false
-        required: false
-      skip-linux:
-        type: boolean
-        description: 'Skip Linux builds'
-        default: false
-        required: false
-      skip-lint:
-        type: boolean
-        description: 'Skip lint check'
-        default: false
-        required: false
-  push:
-    branches:
-      - main
-      - '[1-9][0-9]-x-y'
-  pull_request:
-      
-jobs:
-  setup:
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
-    outputs:
-        docs: ${{ steps.filter.outputs.docs }}
-        src: ${{ steps.filter.outputs.src }}
-        build-image-sha: ${{ steps.set-output.outputs.build-image-sha }}
-        docs-only: ${{ steps.set-output.outputs.docs-only }}
-    steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.0.2
-    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
-      id: filter
-      with:
-        filters: |
-          docs:
-            - 'docs/**'
-          src:
-            - '!docs/**'
-    - name: Set Outputs for Build Image SHA & Docs Only
-      id: set-output
-      run: |
-        if [ -z "${{ inputs.build-image-sha }}" ]; then
-          echo "build-image-sha=cf814a4d2501e8e843caea071a6b70a48e78b855" >> "$GITHUB_OUTPUT"
-        else
-          echo "build-image-sha=${{ inputs.build-image-sha }}" >> "$GITHUB_OUTPUT"
-        fi
-        echo "docs-only=${{ steps.filter.outputs.docs == 'true' && steps.filter.outputs.src == 'false' }}" >> "$GITHUB_OUTPUT"
-
-  # Lint Jobs
-  lint:
-    needs: setup
-    if: ${{ !inputs.skip-lint }}
-    uses: ./.github/workflows/pipeline-electron-lint.yml
-    with:
-      container: '{"image":"ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}","options":"--user root"}'
-    secrets: inherit
-
-  # Docs Only Jobs
-  docs-only:
-    needs: setup
-    if: ${{ needs.setup.outputs.docs-only == 'true' }}
-    uses: ./.github/workflows/pipeline-electron-docs-only.yml
-    with:
-      container: '{"image":"ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}","options":"--user root"}'
-    secrets: inherit
-
-  # Checkout Jobs
-  checkout-macos:
-    needs: setup
-    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-macos}}
-    runs-on: electron-arc-linux-amd64-32core
-    container:
-      image: ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}
-      options: --user root
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-        - /var/run/sas:/var/run/sas
-    env:
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    outputs:
-      build-image-sha: ${{ needs.setup.outputs.build-image-sha }}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Checkout & Sync & Save
-      uses: ./src/electron/.github/actions/checkout
-      with:
-        generate-sas-token: 'true'
-
-  checkout-linux:
-    needs: setup
-    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-linux}}
-    runs-on: electron-arc-linux-amd64-32core
-    container:
-      image: ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}
-      options: --user root
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-        - /var/run/sas:/var/run/sas
-    env:
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    outputs:
-      build-image-sha: ${{ needs.setup.outputs.build-image-sha}}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Checkout & Sync & Save
-      uses: ./src/electron/.github/actions/checkout
-
-  # Build Jobs - These cascade into testing jobs
-  macos-x64:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-macos
-    with:
-      build-runs-on: macos-14-xlarge
-      test-runs-on: macos-13
-      target-platform: macos
-      target-arch: x64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit
-  
-  macos-arm64:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-macos
-    with:
-      build-runs-on: macos-14-xlarge
-      test-runs-on: macos-14
-      target-platform: macos
-      target-arch: arm64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit
-
-  linux-x64:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test-and-nan.yml
-    needs: checkout-linux
-    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      test-runs-on: electron-arc-linux-amd64-4core
-      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      test-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
-      target-platform: linux
-      target-arch: x64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit
-
-  linux-x64-asan:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-linux
-    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      test-runs-on: electron-arc-linux-amd64-4core
-      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      test-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
-      target-platform: linux
-      target-arch: x64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-      is-asan: true
-    secrets: inherit
-  
-  linux-arm:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-linux
-    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      test-runs-on: electron-arc-linux-arm64-4core
-      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      test-container: '{"image":"ghcr.io/electron/test:arm32v7-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init","volumes":["/home/runner/externals:/mnt/runner-externals"]}'
-      target-platform: linux
-      target-arch: arm
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit
-  
-  linux-arm64:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: checkout-linux
-    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      test-runs-on: electron-arc-linux-arm64-4core
-      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      test-container: '{"image":"ghcr.io/electron/test:arm64v8-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
-      target-platform: linux
-      target-arch: arm64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit

.github/workflows/config/gclient.diff

@@ -1,14 +0,0 @@
-diff --git a/gclient.py b/gclient.py
-index 59e2b4c5197928bdba1ef69bdbe637d7dfe471c1..b4bae5e48c83c84bd867187afaf40eed16e69851 100755
---- a/gclient.py
-+++ b/gclient.py
-@@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
-                         not condition or "non_git_source" not in condition):
-                     continue
-                 cipd_root = self.GetCipdRoot()
--                for package in dep_value.get('packages', []):
-+                packages = dep_value.get('packages', [])
-+                for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
-                     deps_to_add.append(
-                         CipdDependency(parent=self,
-                                        name=name,

.github/workflows/issue-commented.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}

.github/workflows/issue-labeled.yml

@@ -14,13 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Set status
-        uses: dsanders11/project-actions/edit-item@a24415515fa60a22f71f9d9d00e36ca82660cde9 # v1.0.1
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 90
@@ -46,7 +46,7 @@ jobs:
           fi
       - name: Generate GitHub App token
         if: ${{ steps.check-for-comment.outputs.SHOULD_COMMENT }}
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}

.github/workflows/issue-opened.yml

@@ -19,7 +19,7 @@ jobs:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Add to Issue Triage
-        uses: dsanders11/project-actions/add-item@a24415515fa60a22f71f9d9d00e36ca82660cde9 # v1.0.1
+        uses: dsanders11/project-actions/add-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         with:
           field: Reporter
           field-value: ${{ github.event.issue.user.login }}

.github/workflows/issue-unlabeled.yml

@@ -23,14 +23,14 @@ jobs:
           fi
       - name: Generate GitHub App token
         if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Set status
         if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
-        uses: dsanders11/project-actions/edit-item@a24415515fa60a22f71f9d9d00e36ca82660cde9 # v1.0.1
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 90

.github/workflows/linux-publish.yml

@@ -1,86 +0,0 @@
-name: Publish Linux
-
-on:
-  workflow_dispatch:
-    inputs:
-      build-image-sha:
-        type: string
-        description: 'SHA for electron/build image'
-        default: 'cf814a4d2501e8e843caea071a6b70a48e78b855'
-      upload-to-storage:
-        description: 'Uploads to Azure storage'
-        required: false
-        default: '1'
-        type: string
-      run-linux-publish:
-        description: 'Run the publish jobs vs just the build jobs'
-        type: boolean
-        default: false
-
-jobs:
-  checkout-linux:
-    runs-on: electron-arc-linux-amd64-32core
-    container:
-      image: ghcr.io/electron/build:${{ inputs.build-image-sha }}
-      options: --user root
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-        - /var/run/sas:/var/run/sas
-    env:
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Checkout & Sync & Save
-      uses: ./src/electron/.github/actions/checkout
-
-  publish-x64:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-linux
-    with:
-      environment: production-release
-      build-runs-on: electron-arc-linux-amd64-32core
-      build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      target-platform: linux
-      target-arch: x64
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      strip-binaries: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-linux
-    with:
-      environment: production-release
-      build-runs-on: electron-arc-linux-amd64-32core
-      build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      target-platform: linux
-      target-arch: arm
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      strip-binaries: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm64:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-linux
-    with:
-      environment: production-release
-      build-runs-on: electron-arc-linux-amd64-32core
-      build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      target-platform: linux
-      target-arch: arm64
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      strip-binaries: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit

.github/workflows/macos-publish.yml

@@ -1,69 +0,0 @@
-name: Publish MacOS
-
-on:
-  workflow_dispatch:
-    inputs:
-      build-image-sha:
-        type: string
-        description: 'SHA for electron/build image'
-        default: 'cf814a4d2501e8e843caea071a6b70a48e78b855'
-        required: true
-      upload-to-storage:
-        description: 'Uploads to Azure storage'
-        required: false
-        default: '1'
-        type: string
-      run-macos-publish:
-        description: 'Run the publish jobs vs just the build jobs'
-        type: boolean
-        default: false
-
-jobs:
-  checkout-macos:
-    runs-on: electron-arc-linux-amd64-32core
-    container:
-      image: ghcr.io/electron/build:${{ inputs.build-image-sha }}
-      options: --user root
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-        - /var/run/sas:/var/run/sas
-    env:
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Checkout & Sync & Save
-      uses: ./src/electron/.github/actions/checkout
-      with:
-        generate-sas-token: 'true'
-
-  publish-x64:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-macos
-    with:
-      environment: production-release
-      build-runs-on: macos-14-xlarge
-      target-platform: macos
-      target-arch: x64
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm64:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-macos
-    with:
-      environment: production-release
-      build-runs-on: macos-14-xlarge
-      target-platform: macos
-      target-arch: arm64
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit

.github/workflows/pipeline-electron-build-and-test-and-nan.yml

@@ -1,103 +0,0 @@
-name: Electron Build & Test (+ Node + NaN) Pipeline
-
-on:
-  workflow_call:
-    inputs:
-      target-platform:
-        type: string
-        description: 'Platform to run on, can be macos or linux'
-        required: true
-      target-arch:
-        type: string
-        description: 'Arch to build for, can be x64, arm64 or arm'
-        required: true
-      build-runs-on:
-        type: string
-        description: 'What host to run the build'
-        required: true
-      test-runs-on:
-        type: string
-        description: 'What host to run the tests on'
-        required: true
-      build-container:
-        type: string
-        description: 'JSON container information for aks runs-on'
-        required: false
-        default: '{"image":null}'
-      test-container:
-        type: string
-        description: 'JSON container information for testing'
-        required: false
-        default: '{"image":null}'
-      is-release:
-        description: 'Whether this build job is a release job'
-        required: true
-        type: boolean
-        default: false
-      gn-build-type:
-        description: 'The gn build type - testing or release'
-        required: true
-        type: string
-        default: testing
-      generate-symbols: 
-        description: 'Whether or not to generate symbols'
-        required: true
-        type: boolean
-        default: false
-      upload-to-storage: 
-        description: 'Whether or not to upload build artifacts to external storage'
-        required: true
-        type: string
-        default: '0'
-      is-asan: 
-        description: 'Building the Address Sanitizer (ASan) Linux build'
-        required: false
-        type: boolean
-        default: false
-
-concurrency:
-  group: electron-build-and-test-and-nan-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
-
-jobs:
-  build:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    with:
-      build-runs-on: ${{ inputs.build-runs-on }}
-      build-container: ${{ inputs.build-container }}
-      target-platform: ${{ inputs.target-platform }}
-      target-arch: ${{ inputs.target-arch }}
-      is-release: ${{ inputs.is-release }}
-      gn-build-type: ${{ inputs.gn-build-type }}
-      generate-symbols: ${{ inputs.generate-symbols }}
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-  gn-check:
-    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
-    with:
-      target-platform: ${{ inputs.target-platform }}
-      target-arch: ${{ inputs.target-arch }}
-      check-runs-on: ${{ inputs.build-runs-on }}
-      check-container: ${{ inputs.build-container }}
-      gn-build-type: ${{ inputs.gn-build-type }}
-      is-asan: ${{ inputs.is-asan }}
-    secrets: inherit
-  test:
-    uses: ./.github/workflows/pipeline-segment-electron-test.yml
-    needs: build
-    with:
-      target-arch: ${{ inputs.target-arch }}
-      target-platform: ${{ inputs.target-platform }}
-      test-runs-on: ${{ inputs.test-runs-on }}
-      test-container: ${{ inputs.test-container }}
-    secrets: inherit
-  nn-test:
-    uses: ./.github/workflows/pipeline-segment-node-nan-test.yml
-    needs: build
-    with:
-      target-arch: ${{ inputs.target-arch }}
-      target-platform: ${{ inputs.target-platform }}
-      test-runs-on: ${{ inputs.test-runs-on }}
-      test-container: ${{ inputs.test-container }}
-      gn-build-type: ${{ inputs.gn-build-type }}
-    secrets: inherit

.github/workflows/pipeline-electron-build-and-test.yml

@@ -1,100 +0,0 @@
-name: Electron Build & Test Pipeline
-
-on:
-  workflow_call:
-    inputs:
-      target-platform:
-        type: string
-        description: 'Platform to run on, can be macos or linux'
-        required: true
-      target-arch:
-        type: string
-        description: 'Arch to build for, can be x64, arm64 or arm'
-        required: true
-      build-runs-on:
-        type: string
-        description: 'What host to run the build'
-        required: true
-      test-runs-on:
-        type: string
-        description: 'What host to run the tests on'
-        required: true
-      build-container:
-        type: string
-        description: 'JSON container information for aks runs-on'
-        required: false
-        default: '{"image":null}'
-      test-container:
-        type: string
-        description: 'JSON container information for testing'
-        required: false
-        default: '{"image":null}'
-      is-release:
-        description: 'Whether this build job is a release job'
-        required: true
-        type: boolean
-        default: false
-      gn-build-type:
-        description: 'The gn build type - testing or release'
-        required: true
-        type: string
-        default: testing
-      generate-symbols: 
-        description: 'Whether or not to generate symbols'
-        required: true
-        type: boolean
-        default: false
-      upload-to-storage: 
-        description: 'Whether or not to upload build artifacts to external storage'
-        required: true
-        type: string
-        default: '0'
-      is-asan: 
-        description: 'Building the Address Sanitizer (ASan) Linux build'
-        required: false
-        type: boolean
-        default: false
-
-concurrency:
-  group: electron-build-and-test-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
-
-permissions:
-  contents: read
-  issues: read
-  pull-requests: read  
-
-jobs:
-  build:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    with:
-      build-runs-on: ${{ inputs.build-runs-on }}
-      build-container: ${{ inputs.build-container }}
-      target-platform: ${{ inputs.target-platform }}
-      target-arch: ${{ inputs.target-arch }}
-      is-release: ${{ inputs.is-release }}
-      gn-build-type: ${{ inputs.gn-build-type }}
-      generate-symbols: ${{ inputs.generate-symbols }}
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-      is-asan: ${{ inputs.is-asan}}
-    secrets: inherit
-  gn-check:
-    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
-    with:
-      target-platform: ${{ inputs.target-platform }}
-      target-arch: ${{ inputs.target-arch }}
-      check-runs-on: ${{ inputs.build-runs-on }}
-      check-container: ${{ inputs.build-container }}
-      gn-build-type: ${{ inputs.gn-build-type }}
-      is-asan: ${{ inputs.is-asan }}
-    secrets: inherit
-  test:
-    uses: ./.github/workflows/pipeline-segment-electron-test.yml
-    needs: build
-    with:
-      target-arch: ${{ inputs.target-arch }}
-      target-platform: ${{ inputs.target-platform }}
-      test-runs-on: ${{ inputs.test-runs-on }}
-      test-container: ${{ inputs.test-container }}
-      is-asan: ${{ inputs.is-asan}}
-    secrets: inherit

.github/workflows/pipeline-electron-docs-only.yml

@@ -1,43 +0,0 @@
-name: Electron Docs Compile
-
-on:
-  workflow_call:
-    inputs:
-      container:
-        required: true
-        description: 'Container to run the docs-only ts compile in'
-        type: string
-
-concurrency:
-  group: electron-docs-only-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  docs-only:
-    name: Docs Only Compile
-    runs-on: electron-arc-linux-amd64-4core
-    timeout-minutes: 20
-    container: ${{ fromJSON(inputs.container) }}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-    - name: Run TS/JS compile
-      shell: bash
-      run: |
-        cd src/electron
-        node script/yarn create-typescript-definitions
-        node script/yarn tsc -p tsconfig.default_app.json --noEmit
-        for f in build/webpack/*.js
-        do
-            out="${f:29}"
-            if [ "$out" != "base.js" ]; then
-            node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env mode=development
-            fi
-        done

.github/workflows/pipeline-electron-lint.yml

@@ -1,77 +0,0 @@
-name: Electron Lint
-
-on:
-  workflow_call:
-    inputs:
-      container:
-        required: true
-        description: 'Container to run lint in'
-        type: string
-
-concurrency:
-  group: electron-lint-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: electron-arc-linux-amd64-4core
-    timeout-minutes: 20
-    container: ${{ fromJSON(inputs.container) }}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-    - name: Setup third_party Depot Tools
-      shell: bash
-      run: |
-        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
-        echo "$(pwd)/src/third_party/depot_tools" >> $GITHUB_PATH
-    - name: Download GN Binary
-      shell: bash
-      run: |
-        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-        gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
-
-        cipd ensure -ensure-file - -root . <<-CIPD
-        \$ServiceURL https://chrome-infra-packages.appspot.com/
-        @Subdir src/buildtools/linux64
-        gn/gn/linux-amd64 $gn_version
-        CIPD
-
-        buildtools_path="$(pwd)/src/buildtools"
-        echo "CHROMIUM_BUILDTOOLS_PATH=$buildtools_path" >> $GITHUB_ENV
-    - name: Download clang-format Binary
-      shell: bash
-      run: |
-        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-
-        sha1_path='buildtools/linux64/clang-format.sha1'
-        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
-
-        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
-    - name: Run Lint
-      shell: bash
-      run: |
-        # gn.py tries to find a gclient root folder starting from the current dir.
-        # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
-        touch .gclient
-        # Another option would be to checkout "buildtools" inside the Electron checkout,
-        # but then we would lint its contents (at least gn format), and it doesn't pass it.
-
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-        node script/yarn lint
-    - name: Run Script Typechecker
-      shell: bash
-      run: |
-        cd src/electron
-        node script/yarn tsc -p tsconfig.script.json
-    

.github/workflows/pipeline-segment-electron-build.yml

@@ -1,216 +0,0 @@
-name: Pipeline Segment - Electron Build
-
-on:
-  workflow_call:
-    inputs:
-      environment:
-        description: using the production or testing environment
-        required: false
-        type: string
-      target-platform:
-        type: string
-        description: 'Platform to run on, can be macos or linux'
-        required: true
-      target-arch:
-        type: string
-        description: 'Arch to build for, can be x64, arm64 or arm'
-        required: true
-      build-runs-on:
-        type: string
-        description: 'What host to run the build'
-        required: true
-      build-container:
-        type: string
-        description: 'JSON container information for aks runs-on'
-        required: false
-        default: '{"image":null}'
-      is-release:
-        description: 'Whether this build job is a release job'
-        required: true
-        type: boolean
-        default: false
-      gn-build-type:
-        description: 'The gn build type - testing or release'
-        required: true
-        type: string
-        default: testing
-      generate-symbols: 
-        description: 'Whether or not to generate symbols'
-        required: true
-        type: boolean
-        default: false
-      upload-to-storage: 
-        description: 'Whether or not to upload build artifacts to external storage'
-        required: true
-        type: string
-        default: '0'
-      strip-binaries: 
-        description: 'Strip the binaries before release (Linux only)'
-        required: false
-        type: boolean
-        default: false
-      is-asan: 
-        description: 'Building the Address Sanitizer (ASan) Linux build'
-        required: false
-        type: boolean
-        default: false
-
-
-concurrency:
-  group: electron-build-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.is-asan }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
-
-env:
-  ELECTRON_ARTIFACTS_BLOB_STORAGE: ${{ secrets.ELECTRON_ARTIFACTS_BLOB_STORAGE }}
-  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-  ELECTRON_GITHUB_TOKEN: ${{ secrets.ELECTRON_GITHUB_TOKEN }}
-  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
-  ELECTRON_OUT_DIR: Default
-
-jobs:
-  build:
-    runs-on: ${{ inputs.build-runs-on }}
-    container: ${{ fromJSON(inputs.build-container) }}
-    environment: ${{ inputs.environment }}
-    env:
-      TARGET_ARCH: ${{ inputs.target-arch }}
-    steps:
-    - name: Create src dir
-      run: mkdir src
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Setup Node.js/npm
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
-      with:
-        node-version: 20.11.x
-        cache: yarn
-        cache-dependency-path: src/electron/yarn.lock
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-    - name: Install Python Tools (Mac)
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: brew install python-setuptools
-    - name: Install AZCopy
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: brew install azcopy
-    - name: Set GN_EXTRA_ARGS for Linux
-      if: ${{ inputs.target-platform == 'linux' }}
-      run: |
-        if [ "${{ inputs.target-arch  }}" = "arm" ]; then
-          if [ "${{ inputs.is-release  }}" = true ]; then
-            GN_EXTRA_ARGS='target_cpu="arm" build_tflite_with_xnnpack=false symbol_level=1'
-          else
-            GN_EXTRA_ARGS='target_cpu="arm" build_tflite_with_xnnpack=false'
-          fi
-        elif [ "${{ inputs.target-arch }}" = "arm64" ]; then
-          GN_EXTRA_ARGS='target_cpu="arm64" fatal_linker_warnings=false enable_linux_installer=false'
-        elif [ "${{ inputs.is-asan }}" = true ]; then
-          GN_EXTRA_ARGS='is_asan=true'
-        fi
-        echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
-    - name: Get Depot Tools
-      timeout-minutes: 5
-      run: |
-        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-
-        SEDOPTION="-i"
-        if [ "`uname`" = "Darwin" ]; then
-          SEDOPTION="-i ''"
-        fi
-
-        # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
-        sed $SEDOPTION '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
-        if [ "`uname`" = "Linux" ]; then
-          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-        fi
-        touch .disable_auto_update
-    - name: Add Depot Tools to PATH
-      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-    - name: Generate DEPS Hash
-      run: |
-        node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
-        DEPSHASH=v1-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')
-        echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
-        echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
-    - name: Restore src cache via AZCopy
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: ./src/electron/.github/actions/restore-cache-azcopy
-    - name: Restore src cache via AKS
-      if: ${{ inputs.target-platform == 'linux' }}
-      uses: ./src/electron/.github/actions/restore-cache-aks
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Build Tools
-      uses: ./src/electron/.github/actions/install-build-tools
-    - name: Init Build Tools
-      run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk
-    - name: Run Electron Only Hooks
-      run: |
-        gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
-    - name: Regenerate DEPS Hash
-      run: |
-        (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
-        echo "DEPSHASH=$(shasum src/electron/.depshash | cut -f1 -d' ')" >> $GITHUB_ENV
-    - name: Add CHROMIUM_BUILDTOOLS_PATH to env
-      run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV
-    - name: Fix Sync
-      uses: ./src/electron/.github/actions/fix-sync
-      with:
-        target-arch: ${{ inputs.target-arch }}
-        target-platform: ${{ inputs.target-platform }}
-    - name: Install build-tools & Setup RBE
-      run: |
-        echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform == 'linux' && '300' || '200' }}" >> $GITHUB_ENV
-        cd ~/.electron_build_tools
-        npx yarn --ignore-engines
-        # Pull down credential helper and print status
-        node -e "require('./src/utils/reclient.js').downloadAndPrepare({})"
-        HELPER=$(node -p "require('./src/utils/reclient.js').helperPath({})")
-        $HELPER login
-        echo 'RBE_service='`node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"` >> $GITHUB_ENV
-        echo 'RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $GITHUB_ENV
-        echo 'RBE_experimental_credentials_helper_args=print' >> $GITHUB_ENV
-    - name: Free up space (macOS)
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: ./src/electron/.github/actions/free-space-macos
-    - name: Build Electron
-      uses: ./src/electron/.github/actions/build-electron
-      with:
-        target-arch: ${{ inputs.target-arch }}
-        target-platform: ${{ inputs.target-platform }}
-        artifact-platform: ${{ inputs.target-platform == 'linux' && 'linux' || 'darwin' }}
-        is-release: '${{ inputs.is-release }}'
-        generate-symbols: '${{ inputs.generate-symbols }}'
-        strip-binaries: '${{ inputs.strip-binaries }}'
-        upload-to-storage: '${{ inputs.upload-to-storage }}'
-        is-asan: '${{ inputs.is-asan }}'
-    - name: Set GN_EXTRA_ARGS for MAS Build
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: |
-        echo "MAS_BUILD=true" >> $GITHUB_ENV
-        GN_EXTRA_ARGS='is_mas_build=true'
-        echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
-    - name: Build Electron (MAS)
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: ./src/electron/.github/actions/build-electron
-      with:
-        target-arch: ${{ inputs.target-arch }}
-        target-platform: ${{ inputs.target-platform }}
-        artifact-platform: 'mas'
-        is-release: '${{ inputs.is-release }}'
-        generate-symbols: '${{ inputs.generate-symbols }}'
-        upload-to-storage: '${{ inputs.upload-to-storage }}'
-        step-suffix: '(mas)'

.github/workflows/pipeline-segment-electron-gn-check.yml

@@ -1,141 +0,0 @@
-name: Pipeline Segment - Electron GN Check
-
-on:
-  workflow_call:
-    inputs:
-      target-platform:
-        type: string
-        description: 'Platform to run on, can be macos or linux'
-        required: true
-      target-arch:
-        type: string
-        description: 'Arch to build for, can be x64, arm64 or arm'
-        required: true
-      check-runs-on:
-        type: string
-        description: 'What host to run the tests on'
-        required: true
-      check-container:
-        type: string
-        description: 'JSON container information for aks runs-on'
-        required: false
-        default: '{"image":null}'
-      gn-build-type:
-        description: 'The gn build type - testing or release'
-        required: true
-        type: string
-        default: testing
-      is-asan: 
-        description: 'Building the Address Sanitizer (ASan) Linux build'
-        required: false
-        type: boolean
-        default: false
-
-concurrency:
-  group: electron-gn-check-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.is-asan }}-${{ github.ref }}
-  cancel-in-progress: true
-
-env:
-  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
-  ELECTRON_OUT_DIR: Default
-  TARGET_ARCH: ${{ inputs.target-arch }}
-
-jobs:
-  gn-check:
-    # TODO(codebytere): Change this to medium VM
-    runs-on: ${{ inputs.check-runs-on }}
-    container: ${{ fromJSON(inputs.check-container) }}
-    env:
-      TARGET_ARCH: ${{ inputs.target-arch }}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Build Tools
-      uses: ./src/electron/.github/actions/install-build-tools
-    - name: Init Build Tools
-      run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk
-    - name: Get Depot Tools
-      timeout-minutes: 5
-      run: |
-        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-
-        SEDOPTION="-i"
-        if [ "`uname`" = "Darwin" ]; then
-          SEDOPTION="-i ''"
-        fi
-
-        # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
-        sed $SEDOPTION '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
-        if [ "`uname`" = "Linux" ]; then
-          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-        fi
-        touch .disable_auto_update
-    - name: Add Depot Tools to PATH
-      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-    - name: Set GN_EXTRA_ARGS for Linux
-      if: ${{ inputs.target-platform == 'linux' }}
-      run: |
-        if [ "${{ inputs.target-arch  }}" = "arm" ]; then
-          GN_EXTRA_ARGS='build_tflite_with_xnnpack=false'
-        elif [ "${{ inputs.target-arch }}" = "arm64" ]; then
-          GN_EXTRA_ARGS='fatal_linker_warnings=false enable_linux_installer=false'
-        fi
-        echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
-    - name: Generate DEPS Hash
-      run: |
-        node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
-        DEPSHASH=v1-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')
-        echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
-        echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
-    - name: Restore src cache via AZCopy
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: ./src/electron/.github/actions/restore-cache-azcopy
-    - name: Restore src cache via AKS
-      if: ${{ inputs.target-platform == 'linux' }}
-      uses: ./src/electron/.github/actions/restore-cache-aks
-    - name: Run Electron Only Hooks
-      run: |
-        gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
-    - name: Regenerate DEPS Hash
-      run: |
-        (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
-        echo "DEPSHASH=$(shasum src/electron/.depshash | cut -f1 -d' ')" >> $GITHUB_ENV
-    - name: Add CHROMIUM_BUILDTOOLS_PATH to env
-      run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Default GN gen
-      run: |
-        cd src/electron
-        git pack-refs
-        cd ..
-
-        e build --only-gen
-    - name: Run GN Check
-      run: |
-        cd src
-        gn check out/Default //electron:electron_lib
-        gn check out/Default //electron:electron_app
-        gn check out/Default //electron/shell/common/api:mojo
-
-        # Check the hunspell filenames
-        node electron/script/gen-hunspell-filenames.js --check
-        node electron/script/gen-libc++-filenames.js --check
-    - name: Wait for active SSH sessions
-      if: always() && !cancelled()
-      run: |
-        while [ -f /var/.ssh-lock ]
-        do
-          sleep 60
-        done

.github/workflows/pipeline-segment-electron-test.yml

@@ -1,196 +0,0 @@
-name: Pipeline Segment - Electron Test
-
-on:
-  workflow_call:
-    inputs:
-      target-platform:
-        type: string
-        description: 'Platform to run on, can be macos or linux'
-        required: true
-      target-arch:
-        type: string
-        description: 'Arch to build for, can be x64, arm64 or arm'
-        required: true
-      test-runs-on:
-        type: string
-        description: 'What host to run the tests on'
-        required: true
-      test-container:
-        type: string
-        description: 'JSON container information for aks runs-on'
-        required: false
-        default: '{"image":null}'
-      is-asan: 
-        description: 'Building the Address Sanitizer (ASan) Linux build'
-        required: false
-        type: boolean
-        default: false
-
-concurrency:
-  group: electron-test-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.is-asan }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
-
-permissions:
-  contents: read
-  issues: read
-  pull-requests: read
-
-env:
-  ELECTRON_OUT_DIR: Default
-  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-  ELECTRON_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  test:
-    runs-on: ${{ inputs.test-runs-on }}
-    container: ${{ fromJSON(inputs.test-container) }}
-    strategy:
-      fail-fast: false
-      matrix:
-        build-type: ${{ inputs.target-platform == 'macos' && fromJSON('["darwin","mas"]') || fromJSON('["linux"]') }}
-        shard: ${{ inputs.target-platform == 'macos' && fromJSON('[1, 2]') || fromJSON('[1, 2, 3]') }}
-    env:
-      BUILD_TYPE: ${{ matrix.build-type }}
-      TARGET_ARCH: ${{ inputs.target-arch }}
-      ARTIFACT_KEY: ${{ matrix.build-type }}_${{ inputs.target-arch }}
-    steps:
-    - name: Fix node20 on arm32 runners
-      if: ${{ inputs.target-arch == 'arm' }}
-      run: |
-        cp $(which node) /mnt/runner-externals/node20/bin/
-    - name: Add TCC permissions on macOS
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: |
-        configure_user_tccdb () {
-          local values=$1
-          local dbPath="$HOME/Library/Application Support/com.apple.TCC/TCC.db"
-          local sqlQuery="INSERT OR REPLACE INTO access VALUES($values);"
-          sqlite3 "$dbPath" "$sqlQuery"
-        }
-
-        configure_sys_tccdb () {
-          local values=$1
-          local dbPath="/Library/Application Support/com.apple.TCC/TCC.db"
-          local sqlQuery="INSERT OR REPLACE INTO access VALUES($values);"
-          sudo sqlite3 "$dbPath" "$sqlQuery"
-        }
-
-        userValuesArray=(
-            "'kTCCServiceMicrophone','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
-            "'kTCCServiceCamera','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
-            "'kTCCServiceBluetoothAlways','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
-        )
-        for values in "${userValuesArray[@]}"; do
-          # Sonoma and higher have a few extra values
-          # Ref: https://github.com/actions/runner-images/blob/main/images/macos/scripts/build/configure-tccdb-macos.sh
-          if [ "$OSTYPE" = "darwin23" ]; then
-            configure_user_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}"
-            configure_sys_tccdb "$values,NULL,NULL,'UNUSED',${values##*,}"
-          else
-            configure_user_tccdb "$values"
-            configure_sys_tccdb "$values"
-          fi
-        done
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-    - name: Get Depot Tools
-      timeout-minutes: 5
-      run: |
-        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-        if [ "`uname`" = "Darwin" ]; then
-          # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
-          sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        else
-          sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-          # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-          cd depot_tools
-          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-        fi
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
-        touch .disable_auto_update
-    - name: Add Depot Tools to PATH
-      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-    - name: Load ASan specific environment variables
-      if: ${{ inputs.is-asan == true }}
-      run: |
-        echo "ARTIFACT_KEY=${{ matrix.build-type }}_${{ inputs.target-arch }}_asan" >> $GITHUB_ENV
-        echo "DISABLE_CRASH_REPORTER_TESTS=true" >> $GITHUB_ENV
-        echo "IS_ASAN=true" >> $GITHUB_ENV
-    - name: Download Generated Artifacts
-      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
-      with:
-        name: generated_artifacts_${{ env.ARTIFACT_KEY }}
-        path: ./generated_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
-    - name: Download Src Artifacts
-      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
-      with:
-        name: src_artifacts_${{ env.ARTIFACT_KEY }}
-        path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
-    - name: Restore Generated Artifacts
-      run: ./src/electron/script/actions/restore-artifacts.sh
-    - name: Unzip Dist, Mksnapshot & Chromedriver
-      run: |
-        cd src/out/Default
-        unzip -:o dist.zip
-        unzip -:o chromedriver.zip
-        unzip -:o mksnapshot.zip
-    - name: Import & Trust Self-Signed Codesigning Cert on MacOS
-      if: ${{ inputs.target-platform == 'macos' && inputs.target-arch == 'x64' }}
-      run: |
-        sudo security authorizationdb write com.apple.trust-settings.admin allow
-        cd src/electron
-        ./script/codesign/generate-identity.sh
-    - name: Run Electron Tests
-      shell: bash
-      env:
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
-        ELECTRON_DISABLE_SECURITY_WARNINGS: 1
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-        DISPLAY: ':99.0'
-      run: |
-        cd src/electron
-        # Get which tests are on this shard
-        tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 2 || 3 }})
-
-        # Run tests
-        if [ "`uname`" = "Darwin" ]; then
-          echo "About to start tests"
-          node script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files
-        else
-          chown :builduser .. && chmod g+w ..
-          chown -R :builduser . && chmod -R g+w .
-          chmod 4755 ../out/Default/chrome-sandbox
-          runuser -u builduser -- git config --global --add safe.directory $(pwd)
-          if [ "${{ inputs.is-asan }}" == "true" ]; then
-            cd ..
-            ASAN_SYMBOLIZE="$PWD/tools/valgrind/asan/asan_symbolize.py --executable-path=$PWD/out/Default/electron"
-            export ASAN_OPTIONS="symbolize=0 handle_abort=1"
-            export G_SLICE=always-malloc
-            export NSS_DISABLE_ARENA_FREE_LIST=1
-            export NSS_DISABLE_UNLOAD=1
-            export LLVM_SYMBOLIZER_PATH=$PWD/third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer
-            export MOCHA_TIMEOUT=180000
-            echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)"
-            cd electron
-            runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files | $ASAN_SYMBOLIZE
-          else
-            runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files
-          fi
-        fi
-    - name: Wait for active SSH sessions
-      if: always() && !cancelled()
-      run: |
-        while [ -f /var/.ssh-lock ]
-        do
-          sleep 60
-        done

.github/workflows/pipeline-segment-node-nan-test.yml

@@ -1,165 +0,0 @@
-name: Pipeline Segment - Node/Nan Test
-
-on:
-  workflow_call:
-    inputs:
-      target-platform:
-        type: string
-        description: 'Platform to run on, can be macos or linux'
-        required: true
-      target-arch:
-        type: string
-        description: 'Arch to build for, can be x64, arm64 or arm'
-        required: true
-      test-runs-on:
-        type: string
-        description: 'What host to run the tests on'
-        required: true
-      test-container:
-        type: string
-        description: 'JSON container information for aks runs-on'
-        required: false
-        default: '{"image":null}'
-      gn-build-type:
-        description: 'The gn build type - testing or release'
-        required: true
-        type: string
-        default: testing
-
-concurrency:
-  group: electron-node-nan-test-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
-
-env:
-  ELECTRON_OUT_DIR: Default
-  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-
-jobs:
-  node-tests:
-    name: Run Node.js Tests
-    runs-on: electron-arc-linux-amd64-8core
-    timeout-minutes: 20
-    env: 
-      TARGET_ARCH: ${{ inputs.target-arch }}
-      BUILD_TYPE: linux
-    container: ${{ fromJSON(inputs.test-container) }}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Build Tools
-      uses: ./src/electron/.github/actions/install-build-tools
-    - name: Init Build Tools
-      run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }}
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-    - name: Get Depot Tools
-      timeout-minutes: 5
-      run: |
-        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
-        touch .disable_auto_update
-    - name: Add Depot Tools to PATH
-      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-    - name: Download Generated Artifacts
-      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
-      with:
-        name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
-        path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
-    - name: Download Src Artifacts
-      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
-      with:
-        name: src_artifacts_linux_${{ env.TARGET_ARCH }}
-        path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
-    - name: Restore Generated Artifacts
-      run: ./src/electron/script/actions/restore-artifacts.sh
-    - name: Unzip Dist
-      run: |
-        cd src/out/Default
-        unzip -:o dist.zip
-    - name: Setup Linux for Headless Testing
-      run: sh -e /etc/init.d/xvfb start
-    - name: Run Node.js Tests
-      run: |
-        cd src
-        node electron/script/node-spec-runner.js --default --jUnitDir=junit
-    - name: Wait for active SSH sessions
-      if: always() && !cancelled()
-      run: |
-        while [ -f /var/.ssh-lock ]
-        do
-          sleep 60
-        done
-  nan-tests:
-    name: Run Nan Tests
-    runs-on: electron-arc-linux-amd64-4core
-    timeout-minutes: 20
-    env: 
-      TARGET_ARCH: ${{ inputs.target-arch }}
-      BUILD_TYPE: linux
-    container: ${{ fromJSON(inputs.test-container) }}
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Install Build Tools
-      uses: ./src/electron/.github/actions/install-build-tools
-    - name: Init Build Tools
-      run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }}
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-    - name: Get Depot Tools
-      timeout-minutes: 5
-      run: |
-        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
-        touch .disable_auto_update
-    - name: Add Depot Tools to PATH
-      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-    - name: Download Generated Artifacts
-      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
-      with:
-        name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
-        path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
-    - name: Download Src Artifacts
-      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
-      with:
-        name: src_artifacts_linux_${{ env.TARGET_ARCH }}
-        path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
-    - name: Restore Generated Artifacts
-      run: ./src/electron/script/actions/restore-artifacts.sh
-    - name: Unzip Dist
-      run: |
-        cd src/out/Default
-        unzip -:o dist.zip
-    - name: Setup Linux for Headless Testing
-      run: sh -e /etc/init.d/xvfb start
-    - name: Run Node.js Tests
-      run: |
-        cd src
-        node electron/script/nan-spec-runner.js
-    - name: Wait for active SSH sessions
-      if: always() && !cancelled()
-      run: |
-        while [ -f /var/.ssh-lock ]
-        do
-          sleep 60
-        done

.github/workflows/pull-request-labeled.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Trigger Slack workflow
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         with:
           payload: |
             {
@@ -27,13 +27,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
           org: electron
       - name: Set status
-        uses: dsanders11/project-actions/edit-item@a24415515fa60a22f71f9d9d00e36ca82660cde9 # v1.0.1
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 94

.github/workflows/scorecards.yml

@@ -22,12 +22,13 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           persist-credentials: false
 
+      # This is a pre-submit / pre-release.
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # tag=v2.1.2
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -41,7 +42,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3.1.2
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: SARIF file
           path: results.sarif
@@ -49,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # tag=v2.1.27
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           sarif_file: results.sarif

.github/workflows/semantic.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: semantic-pull-request
-        uses: amannn/action-semantic-pull-request@01d5fd8a8ebb9aafe902c40c53f0f4744f7381eb # tag: v5
+        uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/stable-prep-items.yml

@@ -27,7 +27,7 @@ jobs:
           PROJECT_NUMBER=$(gh project list --owner electron --format json | jq -r '.projects | map(select(.title | test("^[0-9]+-x-y$"))) | max_by(.number) | .number')
           echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> "$GITHUB_OUTPUT"
       - name: Update Completed Stable Prep Items
-        uses: dsanders11/project-actions/completed-by@a24415515fa60a22f71f9d9d00e36ca82660cde9 # v1.0.1
+        uses: dsanders11/project-actions/completed-by@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
         with:
           field: Prep Status
           field-value: ✅ Complete

.github/workflows/stale.yml

@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag: v6.0.1
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # tag: v9.0.0
         with:
           repo-token: ${{ steps.generate-token.outputs.token }}
           days-before-stale: 90
@@ -27,7 +27,7 @@ jobs:
             This issue has been automatically marked as stale. **If this issue is still affecting you, please leave any comment** (for example, "bump"), and we'll keep it open. If you have any new additional information—in particular, if this is still reproducible in the [latest version of Electron](https://www.electronjs.org/releases/stable) or in the [beta](https://www.electronjs.org/releases/beta)—please include it with your comment!
           close-issue-message: >
             This issue has been closed due to inactivity, and will not be monitored.  If this is a bug and you can reproduce this issue on a [supported version of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline) please open a new issue and include instructions for reproducing the issue.
-          exempt-issue-labels: "discussion,security \U0001F512,enhancement :sparkles:,status/confirmed"
+          exempt-issue-labels: "discussion,security \U0001F512,enhancement :sparkles:,status/confirmed,stale-exempt"
           only-pr-labels: not-a-real-label
   pending-repro:
     runs-on: ubuntu-latest
@@ -35,11 +35,11 @@ jobs:
     needs: stale
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
+        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag: v6.0.1
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # tag: v9.0.0
         with:
           repo-token: ${{ steps.generate-token.outputs.token }}
           days-before-stale: -1

.github/workflows/update_appveyor_image.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         fetch-depth: 0
     - name: Yarn install
@@ -38,7 +38,7 @@ jobs:
         fi
     - name: (Optionally) Update Appveyor Image
       if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: mikefarah/yq@1c7dc0e88aad311c89889bc5ce5d8f96931a1bd0 # v4.27.2
+      uses: mikefarah/yq@bb66c9c872a7a4cf3d6846c2ff6d182c66ec3f77 # v4.40.7
       with:
         cmd: |
           yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor.yml" > "appveyor2.yml"
@@ -57,7 +57,7 @@ jobs:
         rm appveyor-woa2.yml appveyor-woa.diff
     - name: (Optionally) Commit and Pull Request
       if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
+      uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         commit-message: 'build: update appveyor image to latest version'

BUILD.gn

@@ -9,7 +9,7 @@ import("//pdf/features.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//testing/test.gni")
-import("//third_party/electron_node/node.gni")
+import("//third_party/electron_node/electron_node.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//tools/generate_library_loader/generate_library_loader.gni")
 import("//tools/grit/grit_rule.gni")
@@ -81,11 +81,18 @@ if (is_linux) {
     ]
   }
 
-  # Generates headers which contain stubs for extracting function ptrs
-  # from the gtk library. Function signatures for which stubs are
-  # required should be declared in the sig files.
+  # Generates electron_gtk_stubs.h header which contains
+  # stubs for extracting function ptrs from the gtk library.
+  # Function signatures for which stubs are required should be
+  # declared in electron_gtk.sigs, currently this file contains
+  # signatures for the functions used with native file chooser
+  # implementation. In future, this file can be extended to contain
+  # gtk4 stubs to switch gtk version in runtime.
   generate_stubs("electron_gtk_stubs") {
-    sigs = [ "shell/browser/ui/electron_gdk_pixbuf.sigs" ]
+    sigs = [
+      "shell/browser/ui/electron_gdk_pixbuf.sigs",
+      "shell/browser/ui/electron_gtk.sigs",
+    ]
     extra_header = "shell/browser/ui/electron_gtk.fragment"
     output_name = "electron_gtk_stubs"
     public_deps = [ "//ui/gtk:gtk_config" ]
@@ -407,8 +414,10 @@ action("electron_generate_node_defines") {
 }
 
 source_set("electron_lib") {
-  configs += [ "//v8:external_startup_data" ]
-  configs += [ "//third_party/electron_node:node_internals" ]
+  configs += [
+    "//v8:external_startup_data",
+    "//third_party/electron_node:node_internals",
+  ]
 
   public_configs = [
     ":branding",
@@ -654,6 +663,7 @@ source_set("electron_lib") {
   }
   if (is_win) {
     libs += [ "dwmapi.lib" ]
+    sources += [ "shell/common/asar/archive_win.cc" ]
     deps += [
       "//components/crash/core/app:crash_export_thunks",
       "//ui/native_theme:native_theme_browser",
@@ -687,19 +697,10 @@ source_set("electron_lib") {
     ]
   }
 
-  if (enable_views_api) {
-    sources += [
-      "shell/browser/api/views/electron_api_image_view.cc",
-      "shell/browser/api/views/electron_api_image_view.h",
-    ]
-  }
-
   if (enable_printing) {
     sources += [
       "shell/browser/printing/print_view_manager_electron.cc",
       "shell/browser/printing/print_view_manager_electron.h",
-      "shell/browser/printing/printing_utils.cc",
-      "shell/browser/printing/printing_utils.h",
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
       "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
@@ -744,7 +745,7 @@ source_set("electron_lib") {
       "//chrome/browser/resources/pdf:resources",
       "//components/pdf/browser",
       "//components/pdf/browser:interceptors",
-      "//components/pdf/common",
+      "//components/pdf/common:constants",
       "//components/pdf/renderer",
       "//pdf",
     ]
@@ -1464,10 +1465,8 @@ dist_zip("hunspell_dictionaries_zip") {
 }
 
 copy("libcxx_headers") {
-  sources = libcxx_headers + libcxx_licenses + [
-              "//buildtools/third_party/libc++/__assertion_handler",
-              "//buildtools/third_party/libc++/__config_site",
-            ]
+  sources = libcxx_headers + libcxx_licenses +
+            [ "//buildtools/third_party/libc++/__config_site" ]
   outputs = [ "$target_gen_dir/electron_libcxx_include/{{source_root_relative_dir}}/{{source_file_part}}" ]
 }
 

DEPS

@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '122.0.6261.156',
+    '124.0.6367.29',
   'node_version':
-    'v20.9.0',
+    'v20.11.1',
   'nan_version':
     'e14bdcd1f72d62bca1d541b66da43130384ec213',
   'squirrel.mac_version':

appveyor-woa.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-121.0.6116.0
+image: e-123.0.6312.5
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -39,7 +39,7 @@ environment:
   MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, tap"
   DEPOT_TOOLS_WIN_TOOLCHAIN: 1
   DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"
-  GYP_MSVS_HASH_27370823e7: 28622d16b1
+  GYP_MSVS_HASH_7393122652: 3ba76c5c20
   PYTHONIOENCODING: UTF-8
 
   matrix:

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-121.0.6116.0
+image: e-123.0.6312.5
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -39,7 +39,7 @@ environment:
   MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, tap"
   DEPOT_TOOLS_WIN_TOOLCHAIN: 1
   DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"
-  GYP_MSVS_HASH_27370823e7: 28622d16b1
+  GYP_MSVS_HASH_7393122652: 3ba76c5c20
   PYTHONIOENCODING: UTF-8
 
   matrix:

build/args/all.gn

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json
-node_module_version = 121
+node_module_version = 123
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"

build/webpack/webpack.config.base.js

@@ -53,12 +53,6 @@ module.exports = ({
 
     const ignoredModules = [];
 
-    if (defines.ENABLE_VIEWS_API === 'false') {
-      ignoredModules.push(
-        '@electron/internal/browser/api/views/image-view.js'
-      );
-    }
-
     const plugins = [];
 
     if (onlyPrintingGraph) {

buildflags/BUILD.gn

@@ -9,7 +9,6 @@ buildflag_header("buildflags") {
   header = "buildflags.h"
 
   flags = [
-    "ENABLE_VIEWS_API=$enable_views_api",
     "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",

buildflags/buildflags.gni

@@ -3,8 +3,6 @@
 # found in the LICENSE file.
 
 declare_args() {
-  enable_views_api = true
-
   enable_pdf_viewer = true
 
   # Provide a fake location provider for mocking

chromium_src/BUILD.gn

@@ -14,8 +14,6 @@ import("//third_party/widevine/cdm/widevine.gni")
 static_library("chrome") {
   visibility = [ "//electron:electron_lib" ]
   sources = [
-    "//chrome/browser/accessibility/accessibility_ui.cc",
-    "//chrome/browser/accessibility/accessibility_ui.h",
     "//chrome/browser/app_mode/app_mode_utils.cc",
     "//chrome/browser/app_mode/app_mode_utils.h",
     "//chrome/browser/browser_features.cc",
@@ -100,8 +98,8 @@ static_library("chrome") {
     "//chrome/browser/ui/exclusive_access/fullscreen_within_tab_helper.h",
     "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc",
     "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
-    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
-    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
+    "//chrome/browser/ui/exclusive_access/pointer_lock_controller.cc",
+    "//chrome/browser/ui/exclusive_access/pointer_lock_controller.h",
     "//chrome/browser/ui/frame/window_frame_util.cc",
     "//chrome/browser/ui/frame/window_frame_util.h",
     "//chrome/browser/ui/ui_features.cc",
@@ -130,6 +128,8 @@ static_library("chrome") {
     "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
     "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
     "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
+    "//chrome/browser/ui/webui/accessibility/accessibility_ui.cc",
+    "//chrome/browser/ui/webui/accessibility/accessibility_ui.h",
     "//extensions/browser/app_window/size_constraints.cc",
     "//extensions/browser/app_window/size_constraints.h",
     "//ui/views/native_window_tracker.h",

docs/README.md

@@ -106,7 +106,7 @@ These individual tutorials expand on topics discussed in the guide above.
 
 * [app](api/app.md)
 * [autoUpdater](api/auto-updater.md)
-* [BrowserView](api/browser-view.md)
+* [BaseWindow](api/base-window.md)
 * [BrowserWindow](api/browser-window.md)
 * [contentTracing](api/content-tracing.md)
 * [desktopCapturer](api/desktop-capturer.md)
@@ -134,8 +134,10 @@ These individual tutorials expand on topics discussed in the guide above.
 * [TouchBar](api/touch-bar.md)
 * [Tray](api/tray.md)
 * [utilityProcess](api/utility-process.md)
+* [View](api/view.md)
 * [webContents](api/web-contents.md)
 * [webFrameMain](api/web-frame-main.md)
+* [WebContentsView](api/web-contents-view.md)
 
 ### Modules for the Renderer Process (Web Page):
 

docs/api/accelerator.md

@@ -4,7 +4,7 @@
 
 Accelerators are strings that can contain multiple modifiers and a single key code,
 combined by the `+` character, and are used to define keyboard shortcuts
-throughout your application.
+throughout your application. Accelerators are case insensitive.
 
 Examples:
 

docs/api/app.md

@@ -1261,7 +1261,7 @@ Returns `Object`:
 
 * `openAtLogin` boolean - `true` if the app is set to open at login.
 * `openAsHidden` boolean _macOS_ _Deprecated_ - `true` if the app is set to open as hidden at login. This does not work on macOS 13 and up.
-* `wasOpenedAtLogin` boolean _macOS_ - `true` if the app was opened at login automatically.
+* `wasOpenedAtLogin` boolean _macOS_ _Deprecated_ - `true` if the app was opened at login automatically. This setting is not available on [MAS builds][mas-builds] or on macOS 13 and up.
 * `wasOpenedAsHidden` boolean _macOS_ _Deprecated_ - `true` if the app was opened as a hidden login item. This indicates that the app should not open any windows at startup. This setting is not available on [MAS builds][mas-builds] or on macOS 13 and up.
 * `restoreState` boolean _macOS_ _Deprecated_ - `true` if the app was opened as a login item that should restore the state from the previous session. This indicates that the app should restore the windows that were open the last time the app was closed. This setting is not available on [MAS builds][mas-builds] or on macOS 13 and up.
 * `status` string _macOS_ - can be one of `not-registered`, `enabled`, `requires-approval`, or `not-found`.

docs/api/browser-view.md

@@ -1,5 +1,9 @@
 # BrowserView
 
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
 A `BrowserView` can be used to embed additional web content into a
 [`BrowserWindow`](browser-window.md). It is like a child window, except that it is positioned
 relative to its owning window. It is meant to be an alternative to the
@@ -9,6 +13,10 @@ relative to its owning window. It is meant to be an alternative to the
 
 > Create and control views.
 
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
 Process: [Main](../glossary.md#main-process)
 
 This module cannot be used until the `ready` event of the `app`
@@ -30,7 +38,7 @@ app.whenReady().then(() => {
 })
 ```
 
-### `new BrowserView([options])` _Experimental_
+### `new BrowserView([options])` _Experimental_ _Deprecated_
 
 * `options` Object (optional)
   * `webPreferences` [WebPreferences](structures/web-preferences.md?inline) (optional) - Settings of web page's features.
@@ -39,7 +47,7 @@ app.whenReady().then(() => {
 
 Objects created with `new BrowserView` have the following properties:
 
-#### `view.webContents` _Experimental_
+#### `view.webContents` _Experimental_ _Deprecated_
 
 A [`WebContents`](web-contents.md) object owned by this view.
 
@@ -47,7 +55,7 @@ A [`WebContents`](web-contents.md) object owned by this view.
 
 Objects created with `new BrowserView` have the following instance methods:
 
-#### `view.setAutoResize(options)` _Experimental_
+#### `view.setAutoResize(options)` _Experimental_ _Deprecated_
 
 * `options` Object
   * `width` boolean (optional) - If `true`, the view's width will grow and shrink together
@@ -59,19 +67,19 @@ Objects created with `new BrowserView` have the following instance methods:
   * `vertical` boolean (optional) - If `true`, the view's y position and height will grow
     and shrink proportionally with the window. `false` by default.
 
-#### `view.setBounds(bounds)` _Experimental_
+#### `view.setBounds(bounds)` _Experimental_ _Deprecated_
 
 * `bounds` [Rectangle](structures/rectangle.md)
 
 Resizes and moves the view to the supplied bounds relative to the window.
 
-#### `view.getBounds()` _Experimental_
+#### `view.getBounds()` _Experimental_ _Deprecated_
 
 Returns [`Rectangle`](structures/rectangle.md)
 
 The `bounds` of this BrowserView instance as `Object`.
 
-#### `view.setBackgroundColor(color)` _Experimental_
+#### `view.setBackgroundColor(color)` _Experimental_ _Deprecated_
 
 * `color` string - Color in Hex, RGB, ARGB, HSL, HSLA or named CSS color format. The alpha channel is
   optional for the hex type.
@@ -79,25 +87,25 @@ The `bounds` of this BrowserView instance as `Object`.
 Examples of valid `color` values:
 
 * Hex
-  * #fff (RGB)
-  * #ffff (ARGB)
-  * #ffffff (RRGGBB)
-  * #ffffffff (AARRGGBB)
+  * `#fff` (RGB)
+  * `#ffff` (ARGB)
+  * `#ffffff` (RRGGBB)
+  * `#ffffffff` (AARRGGBB)
 * RGB
-  * rgb\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+)\)
-    * e.g. rgb(255, 255, 255)
+  * `rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)`
+    * e.g. `rgb(255, 255, 255)`
 * RGBA
-  * rgba\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+),\s*(\[\d.]+)\)
-    * e.g. rgba(255, 255, 255, 1.0)
+  * `rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)`
+    * e.g. `rgba(255, 255, 255, 1.0)`
 * HSL
-  * hsl\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%\)
-    * e.g. hsl(200, 20%, 50%)
+  * `hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)`
+    * e.g. `hsl(200, 20%, 50%)`
 * HSLA
-  * hsla\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%,\s*(\[\d.]+)\)
-    * e.g. hsla(200, 20%, 50%, 0.5)
+  * `hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)`
+    * e.g. `hsla(200, 20%, 50%, 0.5)`
 * Color name
   * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
   * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
     * e.g. `blueviolet` or `red`
 
-**Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBA` or `RGA`.
+**Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBAA` or `RGB`.

docs/api/browser-window.md

@@ -98,8 +98,8 @@ The `child` window will always show on top of the `top` window.
 
 ## Modal windows
 
-A modal window is a child window that disables parent window, to create a modal
-window, you have to set both `parent` and `modal` options:
+A modal window is a child window that disables parent window. To create a modal
+window, you have to set both the `parent` and `modal` options:
 
 ```js
 const { BrowserWindow } = require('electron')
@@ -140,7 +140,7 @@ state is `hidden` in order to minimize power consumption.
 * On Linux the type of modal windows will be changed to `dialog`.
 * On Linux many desktop environments do not support hiding a modal window.
 
-## Class: BrowserWindow
+## Class: BrowserWindow extends `BaseWindow`
 
 > Create and control browser windows.
 
@@ -440,10 +440,14 @@ Returns `BrowserWindow | null` - The window that is focused in this application,
 Returns `BrowserWindow | null` - The window that owns the given `webContents`
 or `null` if the contents are not owned by a window.
 
-#### `BrowserWindow.fromBrowserView(browserView)`
+#### `BrowserWindow.fromBrowserView(browserView)` _Deprecated_
 
 * `browserView` [BrowserView](browser-view.md)
 
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
 Returns `BrowserWindow | null` - The window that owns the given `browserView`. If the given view is not attached to any window, returns `null`.
 
 #### `BrowserWindow.fromId(id)`
@@ -740,16 +744,16 @@ Examples of valid `backgroundColor` values:
   * #ffffff (RGB)
   * #ffffffff (ARGB)
 * RGB
-  * rgb\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+)\)
+  * `rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)`
     * e.g. rgb(255, 255, 255)
 * RGBA
-  * rgba\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+),\s*(\[\d.]+)\)
+  * `rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)`
     * e.g. rgba(255, 255, 255, 1.0)
 * HSL
-  * hsl\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%\)
+  * `hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)`
     * e.g. hsl(200, 20%, 50%)
 * HSLA
-  * hsla\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%,\s*(\[\d.]+)\)
+  * `hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)`
     * e.g. hsla(200, 20%, 50%, 0.5)
 * Color name
   * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
@@ -1580,41 +1584,62 @@ machine has a touch bar.
 **Note:** The TouchBar API is currently experimental and may change or be
 removed in future Electron releases.
 
-#### `win.setBrowserView(browserView)` _Experimental_
+#### `win.setBrowserView(browserView)` _Experimental_ _Deprecated_
 
 * `browserView` [BrowserView](browser-view.md) | null - Attach `browserView` to `win`.
 If there are other `BrowserView`s attached, they will be removed from
 this window.
 
-#### `win.getBrowserView()` _Experimental_
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
+#### `win.getBrowserView()` _Experimental_ _Deprecated_
 
 Returns `BrowserView | null` - The `BrowserView` attached to `win`. Returns `null`
 if one is not attached. Throws an error if multiple `BrowserView`s are attached.
 
-#### `win.addBrowserView(browserView)` _Experimental_
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
+#### `win.addBrowserView(browserView)` _Experimental_ _Deprecated_
 
 * `browserView` [BrowserView](browser-view.md)
 
 Replacement API for setBrowserView supporting work with multi browser views.
 
-#### `win.removeBrowserView(browserView)` _Experimental_
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
+#### `win.removeBrowserView(browserView)` _Experimental_ _Deprecated_
 
 * `browserView` [BrowserView](browser-view.md)
 
-#### `win.setTopBrowserView(browserView)` _Experimental_
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
+#### `win.setTopBrowserView(browserView)` _Experimental_ _Deprecated_
 
 * `browserView` [BrowserView](browser-view.md)
 
 Raises `browserView` above other `BrowserView`s attached to `win`.
 Throws an error if `browserView` is not attached to `win`.
 
-#### `win.getBrowserViews()` _Experimental_
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
+
+#### `win.getBrowserViews()` _Experimental_ _Deprecated_
 
 Returns `BrowserView[]` - a sorted by z-index array of all BrowserViews that have been attached
 with `addBrowserView` or `setBrowserView`. The top-most BrowserView is the last element of the array.
 
-**Note:** The BrowserView API is currently experimental and may change or be
-removed in future Electron releases.
+> **Note**
+> The `BrowserView` class is deprecated, and replaced by the new
+> [`WebContentsView`](web-contents-view.md) class.
 
 #### `win.setTitleBarOverlay(options)` _Windows_
 

docs/api/dialog.md

@@ -174,7 +174,7 @@ dialog.showOpenDialog(mainWindow, {
     * `dontAddToRecent` _Windows_ - Do not add the item being saved to the recent documents list.
   * `securityScopedBookmarks` boolean (optional) _macOS_ _mas_ - Create a [security scoped bookmark](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store. If this option is enabled and the file doesn't already exist a blank file will be created at the chosen path.
 
-Returns `string`, the path of the file chosen by the user; if the dialog is cancelled it returns an empty string.
+Returns `string | undefined`, the path of the file chosen by the user; if the dialog is cancelled it returns `undefined`.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
 
@@ -207,7 +207,7 @@ The `filters` specifies an array of file types that can be displayed, see
 Returns `Promise<Object>` - Resolve with an object containing the following:
 
 * `canceled` boolean - whether or not the dialog was canceled.
-* `filePath` string - If the dialog is canceled, this will be an empty string.
+* `filePath` string (optional) - If the dialog is canceled, this will be `undefined`.
 * `bookmark` string (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present. (For return values, see [table here](#bookmarks-array).)
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

docs/api/environment-variables.md

@@ -142,11 +142,6 @@ Setting this variable is the same as passing `--log-file`
 on the command line. For more info, see `--log-file` in [command-line
 switches](./command-line-switches.md#--log-filepath).
 
-### `ELECTRON_DEBUG_DRAG_REGIONS`
-
-Adds coloration to draggable regions on [`BrowserView`](./browser-view.md)s on macOS - draggable regions will be colored
-green and non-draggable regions will be colored red to aid debugging.
-
 ### `ELECTRON_DEBUG_NOTIFICATIONS`
 
 Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common actions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.

docs/api/process.md

@@ -21,7 +21,6 @@ In sandboxed renderers the `process` object contains only a subset of the APIs:
 * `getSystemMemoryInfo()`
 * `getSystemVersion()`
 * `getCPUUsage()`
-* `getIOCounters()`
 * `uptime()`
 * `argv`
 * `execPath`
@@ -162,10 +161,6 @@ The time is represented as number of milliseconds since epoch. It returns null i
 
 Returns [`CPUUsage`](structures/cpu-usage.md)
 
-### `process.getIOCounters()` _Windows_ _Linux_
-
-Returns [`IOCounters`](structures/io-counters.md)
-
 ### `process.getHeapStatistics()`
 
 Returns `Object`:

docs/api/session.md

@@ -813,6 +813,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
     * `pointerLock` - Request to directly interpret mouse movements as an input method via the [Pointer Lock API](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API). These requests always appear to originate from the main frame.
     * `keyboardLock` - Request capture of keypresses for any or all of the keys on the physical keyboard via the [Keyboard Lock API](https://developer.mozilla.org/en-US/docs/Web/API/Keyboard/lock). These requests always appear to originate from the main frame.
     * `openExternal` - Request to open links in external applications.
+    * `speaker-selection` - Request to enumerate and select audio output devices via the [speaker-selection permissions policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy/speaker-selection).
     * `storage-access` - Allows content loaded in a third-party context to request access to third-party cookies using the [Storage Access API](https://developer.mozilla.org/en-US/docs/Web/API/Storage_Access_API).
     * `top-level-storage-access` -  Allow top-level sites to request third-party cookie access on behalf of embedded content originating from another site in the same related website set using the [Storage Access API](https://developer.mozilla.org/en-US/docs/Web/API/Storage_Access_API).
     * `window-management` - Request access to enumerate screens using the [`getScreenDetails`](https://developer.chrome.com/en/articles/multi-screen-window-placement/) API.

docs/api/structures/base-window-options.md

@@ -0,0 +1,152 @@
+# BaseWindowConstructorOptions Object
+
+* `width` Integer (optional) - Window's width in pixels. Default is `800`.
+* `height` Integer (optional) - Window's height in pixels. Default is `600`.
+* `x` Integer (optional) - (**required** if y is used) Window's left offset from screen.
+  Default is to center the window.
+* `y` Integer (optional) - (**required** if x is used) Window's top offset from screen.
+  Default is to center the window.
+* `useContentSize` boolean (optional) - The `width` and `height` would be used as web
+  page's size, which means the actual window's size will include window
+  frame's size and be slightly larger. Default is `false`.
+* `center` boolean (optional) - Show window in the center of the screen. Default is `false`.
+* `minWidth` Integer (optional) - Window's minimum width. Default is `0`.
+* `minHeight` Integer (optional) - Window's minimum height. Default is `0`.
+* `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.
+* `maxHeight` Integer (optional) - Window's maximum height. Default is no limit.
+* `resizable` boolean (optional) - Whether window is resizable. Default is `true`.
+* `movable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  movable. This is not implemented on Linux. Default is `true`.
+* `minimizable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  minimizable. This is not implemented on Linux. Default is `true`.
+* `maximizable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  maximizable. This is not implemented on Linux. Default is `true`.
+* `closable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  closable. This is not implemented on Linux. Default is `true`.
+* `focusable` boolean (optional) - Whether the window can be focused. Default is
+  `true`. On Windows setting `focusable: false` also implies setting
+  `skipTaskbar: true`. On Linux setting `focusable: false` makes the window
+  stop interacting with wm, so the window will always stay on top in all
+  workspaces.
+* `alwaysOnTop` boolean (optional) - Whether the window should always stay on top of
+  other windows. Default is `false`.
+* `fullscreen` boolean (optional) - Whether the window should show in fullscreen. When
+  explicitly set to `false` the fullscreen button will be hidden or disabled
+  on macOS. Default is `false`.
+* `fullscreenable` boolean (optional) - Whether the window can be put into fullscreen
+  mode. On macOS, also whether the maximize/zoom button should toggle full
+  screen mode or maximize window. Default is `true`.
+* `simpleFullscreen` boolean (optional) _macOS_ - Use pre-Lion fullscreen on
+  macOS. Default is `false`.
+* `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
+  Default is `false`.
+* `hiddenInMissionControl` boolean (optional) _macOS_ - Whether window should be hidden when the user toggles into mission control.
+* `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
+* `title` string (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
+* `icon` ([NativeImage](../native-image.md) | string) (optional) - The window icon. On Windows it is
+  recommended to use `ICO` icons to get best visual effects, you can also
+  leave it undefined so the executable's icon will be used.
+* `show` boolean (optional) - Whether window should be shown when created. Default is
+  `true`.
+* `frame` boolean (optional) - Specify `false` to create a
+  [frameless window](../../tutorial/window-customization.md#create-frameless-windows). Default is `true`.
+* `parent` BaseWindow (optional) - Specify parent window. Default is `null`.
+* `modal` boolean (optional) - Whether this is a modal window. This only works when the
+  window is a child window. Default is `false`.
+* `acceptFirstMouse` boolean (optional) _macOS_ - Whether clicking an
+  inactive window will also click through to the web contents. Default is
+  `false` on macOS. This option is not configurable on other platforms.
+* `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
+  Default is `false`.
+* `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
+  key is pressed. Default is `false`.
+* `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
+  be resized larger than screen. Only relevant for macOS, as other OSes
+  allow larger-than-screen windows by default. Default is `false`.
+* `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](../browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
+* `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
+* `opacity` number (optional) _macOS_ _Windows_ - Set the initial opacity of
+  the window, between 0.0 (fully transparent) and 1.0 (fully opaque). This
+  is only implemented on Windows and macOS.
+* `darkTheme` boolean (optional) - Forces using dark theme for the window, only works on
+  some GTK+3 desktop environments. Default is `false`.
+* `transparent` boolean (optional) - Makes the window [transparent](../../tutorial/window-customization.md#create-transparent-windows).
+  Default is `false`. On Windows, does not work unless the window is frameless.
+* `type` string (optional) - The type of window, default is normal window. See more about
+  this below.
+* `visualEffectState` string (optional) _macOS_ - Specify how the material
+  appearance should reflect window activity state on macOS. Must be used
+  with the `vibrancy` property. Possible values are:
+  * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
+  * `active` - The backdrop should always appear active.
+  * `inactive` - The backdrop should always appear inactive.
+* `titleBarStyle` string (optional) _macOS_ _Windows_ - The style of window title bar.
+  Default is `default`. Possible values are:
+  * `default` - Results in the standard title bar for macOS or Windows respectively.
+  * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
+  * `hiddenInset` _macOS_ - Only on macOS, results in a hidden title bar
+    with an alternative look where the traffic light buttons are slightly
+    more inset from the window edge.
+  * `customButtonsOnHover` _macOS_ - Only on macOS, results in a hidden
+    title bar and a full size content window, the traffic light buttons will
+    display when being hovered over in the top left of the window.
+    **Note:** This option is currently experimental.
+* `trafficLightPosition` [Point](point.md) (optional) _macOS_ -
+  Set a custom position for the traffic light buttons in frameless windows.
+* `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
+  should have rounded corners on macOS. Default is `true`. Setting this property
+  to `false` will prevent the window from being fullscreenable.
+* `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
+  Windows, which adds standard window frame. Setting it to `false` will remove
+  window shadow and window animations. Default is `true`.
+* `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
+  the window, only on macOS. Can be `appearance-based`, `titlebar`, `selection`,
+  `menu`, `popover`, `sidebar`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
+  `tooltip`, `content`, `under-window`, or `under-page`.
+* `backgroundMaterial` string (optional) _Windows_ - Set the window's
+  system-drawn background material, including behind the non-client area.
+  Can be `auto`, `none`, `mica`, `acrylic` or `tabbed`. See [win.setBackgroundMaterial](../browser-window.md#winsetbackgroundmaterialmaterial-windows) for more information.
+* `zoomToPageWidth` boolean (optional) _macOS_ - Controls the behavior on
+  macOS when option-clicking the green stoplight button on the toolbar or by
+  clicking the Window > Zoom menu item. If `true`, the window will grow to
+  the preferred width of the web page when zoomed, `false` will cause it to
+  zoom to the width of the screen. This will also affect the behavior when
+  calling `maximize()` directly. Default is `false`.
+* `tabbingIdentifier` string (optional) _macOS_ - Tab group name, allows
+  opening the window as a native tab. Windows with the same
+  tabbing identifier will be grouped together. This also adds a native new
+  tab button to your window's tab bar and allows your `app` and window to
+  receive the `new-window-for-tab` event.
+
+When setting minimum or maximum window size with `minWidth`/`maxWidth`/
+`minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
+passing a size that does not follow size constraints to `setBounds`/`setSize` or
+to the constructor of `BrowserWindow`.
+
+The possible values and behaviors of the `type` option are platform dependent.
+Possible values are:
+
+* On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
+  `notification`.
+  * The `desktop` type places the window at the desktop background window level
+    (kCGDesktopWindowLevel - 1). However, note that a desktop window will not
+    receive focus, keyboard, or mouse events. You can still use globalShortcut to
+    receive input sparingly.
+  * The `dock` type creates a dock-like window behavior.
+  * The `toolbar` type creates a window with a toolbar appearance.
+  * The `splash` type behaves in a specific way. It is not
+    draggable, even if the CSS styling of the window's body contains
+    -webkit-app-region: drag. This type is commonly used for splash screens.
+  * The `notification` type creates a window that behaves like a system notification.
+* On macOS, possible types are `desktop`, `textured`, `panel`.
+  * The `textured` type adds metal gradient appearance
+    (`NSWindowStyleMaskTexturedBackground`).
+  * The `desktop` type places the window at the desktop background window level
+    (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
+    focus, keyboard or mouse events, but you can use `globalShortcut` to receive
+    input sparingly.
+  * The `panel` type enables the window to float on top of full-screened apps
+    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
+    reserved for NSPanel, at runtime. Also, the window will appear on all
+    spaces (desktops).
+* On Windows, possible type is `toolbar`.

docs/api/structures/browser-window-options.md

@@ -1,161 +1,11 @@
-# BrowserWindowConstructorOptions Object
+# BrowserWindowConstructorOptions Object extends `BaseWindowConstructorOptions`
 
-* `width` Integer (optional) - Window's width in pixels. Default is `800`.
-* `height` Integer (optional) - Window's height in pixels. Default is `600`.
-* `x` Integer (optional) - (**required** if y is used) Window's left offset from screen.
-  Default is to center the window.
-* `y` Integer (optional) - (**required** if x is used) Window's top offset from screen.
-  Default is to center the window.
-* `useContentSize` boolean (optional) - The `width` and `height` would be used as web
-  page's size, which means the actual window's size will include window
-  frame's size and be slightly larger. Default is `false`.
-* `center` boolean (optional) - Show window in the center of the screen. Default is `false`.
-* `minWidth` Integer (optional) - Window's minimum width. Default is `0`.
-* `minHeight` Integer (optional) - Window's minimum height. Default is `0`.
-* `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.
-* `maxHeight` Integer (optional) - Window's maximum height. Default is no limit.
-* `resizable` boolean (optional) - Whether window is resizable. Default is `true`.
-* `movable` boolean (optional) _macOS_ _Windows_ - Whether window is
-  movable. This is not implemented on Linux. Default is `true`.
-* `minimizable` boolean (optional) _macOS_ _Windows_ - Whether window is
-  minimizable. This is not implemented on Linux. Default is `true`.
-* `maximizable` boolean (optional) _macOS_ _Windows_ - Whether window is
-  maximizable. This is not implemented on Linux. Default is `true`.
-* `closable` boolean (optional) _macOS_ _Windows_ - Whether window is
-  closable. This is not implemented on Linux. Default is `true`.
-* `focusable` boolean (optional) - Whether the window can be focused. Default is
-  `true`. On Windows setting `focusable: false` also implies setting
-  `skipTaskbar: true`. On Linux setting `focusable: false` makes the window
-  stop interacting with wm, so the window will always stay on top in all
-  workspaces.
-* `alwaysOnTop` boolean (optional) - Whether the window should always stay on top of
-  other windows. Default is `false`.
-* `fullscreen` boolean (optional) - Whether the window should show in fullscreen. When
-  explicitly set to `false` the fullscreen button will be hidden or disabled
-  on macOS. Default is `false`.
-* `fullscreenable` boolean (optional) - Whether the window can be put into fullscreen
-  mode. On macOS, also whether the maximize/zoom button should toggle full
-  screen mode or maximize window. Default is `true`.
-* `simpleFullscreen` boolean (optional) _macOS_ - Use pre-Lion fullscreen on
-  macOS. Default is `false`.
-* `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
-  Default is `false`.
-* `hiddenInMissionControl` boolean (optional) _macOS_ - Whether window should be hidden when the user toggles into mission control.
-* `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
-* `title` string (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
-* `icon` ([NativeImage](../native-image.md) | string) (optional) - The window icon. On Windows it is
-  recommended to use `ICO` icons to get best visual effects, you can also
-  leave it undefined so the executable's icon will be used.
-* `show` boolean (optional) - Whether window should be shown when created. Default is
-  `true`.
-* `paintWhenInitiallyHidden` boolean (optional) - Whether the renderer should be active when `show` is `false` and it has just been created.  In order for `document.visibilityState` to work correctly on first load with `show: false` you should set this to `false`.  Setting this to `false` will cause the `ready-to-show` event to not fire.  Default is `true`.
-* `frame` boolean (optional) - Specify `false` to create a
-  [frameless window](../../tutorial/window-customization.md#create-frameless-windows). Default is `true`.
-* `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
-* `modal` boolean (optional) - Whether this is a modal window. This only works when the
-  window is a child window. Default is `false`.
-* `acceptFirstMouse` boolean (optional) _macOS_ - Whether clicking an
-  inactive window will also click through to the web contents. Default is
-  `false` on macOS. This option is not configurable on other platforms.
-* `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
-  Default is `false`.
-* `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
-  key is pressed. Default is `false`.
-* `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
-  be resized larger than screen. Only relevant for macOS, as other OSes
-  allow larger-than-screen windows by default. Default is `false`.
-* `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](../browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
-* `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
-* `opacity` number (optional) _macOS_ _Windows_ - Set the initial opacity of
-  the window, between 0.0 (fully transparent) and 1.0 (fully opaque). This
-  is only implemented on Windows and macOS.
-* `darkTheme` boolean (optional) - Forces using dark theme for the window, only works on
-  some GTK+3 desktop environments. Default is `false`.
-* `transparent` boolean (optional) - Makes the window [transparent](../../tutorial/window-customization.md#create-transparent-windows).
-  Default is `false`. On Windows, does not work unless the window is frameless.
-* `type` string (optional) - The type of window, default is normal window. See more about
-  this below.
-* `visualEffectState` string (optional) _macOS_ - Specify how the material
-  appearance should reflect window activity state on macOS. Must be used
-  with the `vibrancy` property. Possible values are:
-  * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
-  * `active` - The backdrop should always appear active.
-  * `inactive` - The backdrop should always appear inactive.
-* `titleBarStyle` string (optional) _macOS_ _Windows_ - The style of window title bar.
-  Default is `default`. Possible values are:
-  * `default` - Results in the standard title bar for macOS or Windows respectively.
-  * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
-  * `hiddenInset` _macOS_ - Only on macOS, results in a hidden title bar
-    with an alternative look where the traffic light buttons are slightly
-    more inset from the window edge.
-  * `customButtonsOnHover` _macOS_ - Only on macOS, results in a hidden
-    title bar and a full size content window, the traffic light buttons will
-    display when being hovered over in the top left of the window.
-    **Note:** This option is currently experimental.
-* `trafficLightPosition` [Point](point.md) (optional) _macOS_ -
-  Set a custom position for the traffic light buttons in frameless windows.
-* `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
-  should have rounded corners on macOS. Default is `true`. Setting this property
-  to `false` will prevent the window from being fullscreenable.
-* `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
-  Windows, which adds standard window frame. Setting it to `false` will remove
-  window shadow and window animations. Default is `true`.
-* `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
-  the window, only on macOS. Can be `appearance-based`, `titlebar`, `selection`,
-  `menu`, `popover`, `sidebar`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
-  `tooltip`, `content`, `under-window`, or `under-page`.
-* `backgroundMaterial` string (optional) _Windows_ - Set the window's
-  system-drawn background material, including behind the non-client area.
-  Can be `auto`, `none`, `mica`, `acrylic` or `tabbed`. See [win.setBackgroundMaterial](../browser-window.md#winsetbackgroundmaterialmaterial-windows) for more information.
-* `zoomToPageWidth` boolean (optional) _macOS_ - Controls the behavior on
-  macOS when option-clicking the green stoplight button on the toolbar or by
-  clicking the Window > Zoom menu item. If `true`, the window will grow to
-  the preferred width of the web page when zoomed, `false` will cause it to
-  zoom to the width of the screen. This will also affect the behavior when
-  calling `maximize()` directly. Default is `false`.
-* `tabbingIdentifier` string (optional) _macOS_ - Tab group name, allows
-  opening the window as a native tab. Windows with the same
-  tabbing identifier will be grouped together. This also adds a native new
-  tab button to your window's tab bar and allows your `app` and window to
-  receive the `new-window-for-tab` event.
 * `webPreferences` [WebPreferences](web-preferences.md?inline) (optional) - Settings of web page's features.
+* `paintWhenInitiallyHidden` boolean (optional) - Whether the renderer should be active when `show` is `false` and it has just been created.  In order for `document.visibilityState` to work correctly on first load with `show: false` you should set this to `false`.  Setting this to `false` will cause the `ready-to-show` event to not fire.  Default is `true`.
 * `titleBarOverlay` Object | Boolean (optional) -  When using a frameless window in conjunction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
   * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
   * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
   * `height` Integer (optional) _macOS_ _Windows_ - The height of the title bar and Window Controls Overlay in pixels. Default is system height.
 
-When setting minimum or maximum window size with `minWidth`/`maxWidth`/
-`minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
-passing a size that does not follow size constraints to `setBounds`/`setSize` or
-to the constructor of `BrowserWindow`.
-
-The possible values and behaviors of the `type` option are platform dependent.
-Possible values are:
-
-* On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
-  `notification`.
-  * The `desktop` type places the window at the desktop background window level
-    (kCGDesktopWindowLevel - 1). However, note that a desktop window will not
-    receive focus, keyboard, or mouse events. You can still use globalShortcut to
-    receive input sparingly.
-  * The `dock` type creates a dock-like window behavior.
-  * The `toolbar` type creates a window with a toolbar appearance.
-  * The `splash` type behaves in a specific way. It is not
-    draggable, even if the CSS styling of the window's body contains
-    -webkit-app-region: drag. This type is commonly used for splash screens.
-  * The `notification` type creates a window that behaves like a system notification.
-* On macOS, possible types are `desktop`, `textured`, `panel`.
-  * The `textured` type adds metal gradient appearance
-    (`NSWindowStyleMaskTexturedBackground`).
-  * The `desktop` type places the window at the desktop background window level
-    (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
-    focus, keyboard or mouse events, but you can use `globalShortcut` to receive
-    input sparingly.
-  * The `panel` type enables the window to float on top of full-screened apps
-    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
-    reserved for NSPanel, at runtime. Also, the window will appear on all
-    spaces (desktops).
-* On Windows, possible type is `toolbar`.
-
 [overlay-css-env-vars]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#css-environment-variables
 [overlay-javascript-apis]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#javascript-apis

docs/api/structures/io-counters.md

@@ -1,8 +0,0 @@
-# IOCounters Object
-
-* `readOperationCount` number - The number of I/O read operations.
-* `writeOperationCount` number - The number of I/O write operations.
-* `otherOperationCount` number - Then number of I/O other operations.
-* `readTransferCount` number - The number of I/O read transfers.
-* `writeTransferCount` number - The number of I/O write transfers.
-* `otherTransferCount` number - Then number of I/O other transfers.

docs/api/view.md

@@ -0,0 +1,106 @@
+# View
+
+> Create and layout native views.
+
+Process: [Main](../glossary.md#main-process)
+
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
+```js
+const { BaseWindow, View } = require('electron')
+const win = new BaseWindow()
+const view = new View()
+
+view.setBackgroundColor('red')
+view.setBounds({ x: 0, y: 0, width: 100, height: 100 })
+win.contentView.addChildView(view)
+```
+
+## Class: View
+
+> A basic native view.
+
+Process: [Main](../glossary.md#main-process)
+
+`View` is an [EventEmitter][event-emitter].
+
+### `new View()`
+
+Creates a new `View`.
+
+### Instance Events
+
+Objects created with `new View` emit the following events:
+
+#### Event: 'bounds-changed'
+
+Emitted when the view's bounds have changed in response to being laid out. The
+new bounds can be retrieved with [`view.getBounds()`](#viewgetbounds).
+
+### Instance Methods
+
+Objects created with `new View` have the following instance methods:
+
+#### `view.addChildView(view[, index])`
+
+* `view` View - Child view to add.
+* `index` Integer (optional) - Index at which to insert the child view.
+  Defaults to adding the child at the end of the child list.
+
+#### `view.removeChildView(view)`
+
+* `view` View - Child view to remove.
+
+#### `view.setBounds(bounds)`
+
+* `bounds` [Rectangle](structures/rectangle.md) - New bounds of the View.
+
+#### `view.getBounds()`
+
+Returns [`Rectangle`](structures/rectangle.md) - The bounds of this View, relative to its parent.
+
+#### `view.setBackgroundColor(color)`
+
+* `color` string - Color in Hex, RGB, ARGB, HSL, HSLA or named CSS color format. The alpha channel is
+  optional for the hex type.
+
+Examples of valid `color` values:
+
+* Hex
+  * `#fff` (RGB)
+  * `#ffff` (ARGB)
+  * `#ffffff` (RRGGBB)
+  * `#ffffffff` (AARRGGBB)
+* RGB
+  * `rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)`
+    * e.g. `rgb(255, 255, 255)`
+* RGBA
+  * `rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)`
+    * e.g. `rgba(255, 255, 255, 1.0)`
+* HSL
+  * `hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)`
+    * e.g. `hsl(200, 20%, 50%)`
+* HSLA
+  * `hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)`
+    * e.g. `hsla(200, 20%, 50%, 0.5)`
+* Color name
+  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
+  * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
+    * e.g. `blueviolet` or `red`
+
+**Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBAA` or `RGB`.
+
+#### `view.setVisible(visible)`
+
+* `visible` boolean - If false, the view will be hidden from display.
+
+### Instance Properties
+
+Objects created with `new View` have the following properties:
+
+#### `view.children` _Readonly_
+
+A `View[]` property representing the child views of this view.
+
+[event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter

docs/api/web-contents-view.md

@@ -0,0 +1,58 @@
+# WebContentsView
+
+> A View that displays a WebContents.
+
+Process: [Main](../glossary.md#main-process)
+
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
+```js
+const { BaseWindow, WebContentsView } = require('electron')
+const win = new BaseWindow({ width: 800, height: 400 })
+
+const view1 = new WebContentsView()
+win.contentView.addChildView(view1)
+view1.webContents.loadURL('https://electronjs.org')
+view1.setBounds({ x: 0, y: 0, width: 400, height: 400 })
+
+const view2 = new WebContentsView()
+win.contentView.addChildView(view2)
+view2.webContents.loadURL('https://github.com/electron/electron')
+view2.setBounds({ x: 400, y: 0, width: 400, height: 400 })
+```
+
+## Class: WebContentsView extends `View`
+
+> A View that displays a WebContents.
+
+Process: [Main](../glossary.md#main-process)
+
+`WebContentsView` inherits from [`View`](view.md).
+
+`WebContentsView` is an [EventEmitter][event-emitter].
+
+### `new WebContentsView([options])`
+
+* `options` Object (optional)
+  * `webPreferences` [WebPreferences](structures/web-preferences.md) (optional) - Settings of web page's features.
+
+Creates an empty WebContentsView.
+
+### Instance Properties
+
+Objects created with `new WebContentsView` have the following properties, in
+addition to those inherited from [View](view.md):
+
+#### `view.webContents` _Readonly_
+
+A `WebContents` property containing a reference to the displayed `WebContents`.
+Use this to interact with the `WebContents`, for instance to load a URL.
+
+```js
+const { WebContentsView } = require('electron')
+const view = new WebContentsView()
+view.webContents.loadURL('https://electronjs.org/')
+```
+
+[event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter

docs/api/web-contents.md

@@ -582,6 +582,15 @@ Returns:
 
 Emitted when a link is clicked in DevTools or 'Open in new tab' is selected for a link in its context menu.
 
+#### Event: 'devtools-search-query'
+
+Returns:
+
+* `event` Event
+* `query` string - text to query for.
+
+Emitted when 'Search' is selected for text in its context menu.
+
 #### Event: 'devtools-opened'
 
 Emitted when DevTools is opened.
@@ -778,9 +787,6 @@ Returns:
     `input-text`, `input-time`, `input-url`, `input-week`, `output`, `reset-button`,
     `select-list`, `select-list`, `select-multiple`, `select-one`, `submit-button`,
     and `text-area`,
-  * `inputFieldType` string _Deprecated_ - If the context menu was invoked on an
-    input field, the type of that field. Possible values include `none`,
-    `plainText`, `password`, `other`.
   * `spellcheckEnabled` boolean - If the context is editable, whether or not spellchecking is enabled.
   * `menuSourceType` string - Input source that invoked the context menu.
     Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.

docs/api/webview-tag.md

@@ -4,9 +4,10 @@
 
 Electron's `webview` tag is based on [Chromium's `webview`][chrome-webview], which
 is undergoing dramatic architectural changes. This impacts the stability of `webviews`,
-including rendering, navigation, and event routing. We currently recommend to not
-use the `webview` tag and to consider alternatives, like `iframe`, [Electron's `BrowserView`](browser-view.md),
-or an architecture that avoids embedded content altogether.
+including rendering, navigation, and event routing. We currently recommend to
+not use the `webview` tag and to consider alternatives, like `iframe`, a
+[`WebContentsView`](web-contents-view.md), or an architecture that avoids
+embedded content altogether.
 
 ## Enabling
 
@@ -220,7 +221,9 @@ windows. Popups are disabled by default.
 ```
 
 A `string` which is a comma separated list of strings which specifies the web preferences to be set on the webview.
-The full list of supported preference strings can be found in [BrowserWindow](browser-window.md#new-browserwindowoptions).
+The full list of supported preference strings can be found in [BrowserWindow](browser-window.md#new-browserwindowoptions). In addition, webview supports the following preferences:
+
+* `transparent` boolean (optional) - Whether to enable background transparency for the guest page. Default is `true`. **Note:** The guest page's text and background colors are derived from the [color scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/color-scheme) of its root element. When transparency is enabled, the text color will still change accordingly but the background will remain transparent.
 
 The string follows the same format as the features string in `window.open`.
 A name by itself is given a `true` boolean value.
@@ -1045,6 +1048,15 @@ Returns:
 
 Emitted when a link is clicked in DevTools or 'Open in new tab' is selected for a link in its context menu.
 
+#### Event: 'devtools-search-query'
+
+Returns:
+
+* `event` Event
+* `query` string - text to query for.
+
+Emitted when 'Search' is selected for text in its context menu.
+
 ### Event: 'devtools-opened'
 
 Emitted when DevTools is opened.
@@ -1108,9 +1120,6 @@ Returns:
     `input-text`, `input-time`, `input-url`, `input-week`, `output`, `reset-button`,
     `select-list`, `select-list`, `select-multiple`, `select-one`, `submit-button`,
     and `text-area`,
-  * `inputFieldType` string _Deprecated_ - If the context menu was invoked on an
-    input field, the type of that field. Possible values include `none`,
-    `plainText`, `password`, `other`.
   * `spellcheckEnabled` boolean - If the context is editable, whether or not spellchecking is enabled.
   * `menuSourceType` string - Input source that invoked the context menu.
     Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.

docs/breaking-changes.md

@@ -26,6 +26,28 @@ more information.
 
 This switch was never formally documented but it's removal is being noted here regardless. Chromium itself now has better support for color spaces so this flag should not be needed.
 
+### Behavior Changed: `BrowserView.setAutoResize` behavior on macOS
+
+In Electron 30, BrowserView is now a wrapper around the new [WebContentsView](api/web-contents-view.md) API.
+
+Previously, the `setAutoResize` function of the `BrowserView` API was backed by [autoresizing](https://developer.apple.com/documentation/appkit/nsview/1483281-autoresizingmask?language=objc) on macOS, and by a custom algorithm on Windows and Linux.
+For simple use cases such as making a BrowserView fill the entire window, the behavior of these two approaches was identical.
+However, in more advanced cases, BrowserViews would be autoresized differently on macOS than they would be on other platforms, as the custom resizing algorithm for Windows and Linux did not perfectly match the behavior of macOS's autoresizing API.
+The autoresizing behavior is now standardized across all platforms.
+
+If your app uses `BrowserView.setAutoResize` to do anything more complex than making a BrowserView fill the entire window, it's likely you already had custom logic in place to handle this difference in behavior on macOS.
+If so, that logic will no longer be needed in Electron 30 as autoresizing behavior is consistent.
+
+### Removed: `params.inputFormType` property on `context-menu` on `WebContents`
+
+The `inputFormType` property of the params object in the `context-menu`
+event from `WebContents` has been removed. Use the new `formControlType`
+property instead.
+
+### Removed: `process.getIOCounters()`
+
+Chromium has removed access to this information.
+
 ## Planned Breaking API Changes (29.0)
 
 ### Behavior Changed: `ipcRenderer` can no longer be sent over the `contextBridge`

docs/development/goma.md

@@ -3,54 +3,4 @@
 > Goma is a distributed compiler service for open-source projects such as
 > Chromium and Android.
 
-Electron has a deployment of a custom Goma Backend that we make available to
-all Electron Maintainers.  See the [Access](#access) section below for details
-on authentication.  There is also a `cache-only` Goma endpoint that will be
-used by default if you do not have credentials.  Requests to the cache-only
-Goma will not hit our cluster, but will read from our cache and should result
-in significantly faster build times.
-
-## Enabling Goma
-
-Currently the only supported way to use Goma is to use our [Build Tools](https://github.com/electron/build-tools).
-Goma configuration is automatically included when you set up `build-tools`.
-
-If you are a maintainer and have access to our cluster, please ensure that you run
-`e init` with `--goma=cluster` in order to configure `build-tools` to use
-the Goma cluster.  If you have an existing config, you can just set `"goma": "cluster"`
-in your config file.
-
-## Building with Goma
-
-When you are using Goma you can run `ninja` with a substantially higher `j`
-value than would normally be supported by your machine.
-
-Please do not set a value higher than **200**. We monitor Goma system usage, and users
-found to be abusing it with unreasonable concurrency will be de-activated.
-
-```bash
-ninja -C out/Testing electron -j 200
-```
-
-If you're using `build-tools`, appropriate `-j` values will automatically be used for you.
-
-## Monitoring Goma
-
-If you access [http://localhost:8088](http://localhost:8088) on your local
-machine you can monitor compile jobs as they flow through the goma system.
-
-## Access
-
-For security and cost reasons, access to Electron's Goma cluster is currently restricted
-to Electron Maintainers.  If you want access please head to `#access-requests` in
-Slack and ping `@goma-squad` to ask for access.  Please be aware that being a
-maintainer does not _automatically_ grant access and access is determined on a
-case by case basis.
-
-## Uptime / Support
-
-We have automated monitoring of our Goma cluster and cache at https://status.notgoma.com
-
-We do not provide support for usage of Goma and any issues raised asking for help / having
-issues will _probably_ be closed without much reason, we do not have the capacity to handle
-that kind of support.
+Electron's deployment of Goma is deprecated and we are gradually shifting all usage to the [reclient](reclient.md) system. At some point in 2024 the Goma backend will be shutdown.

docs/development/reclient.md

@@ -0,0 +1,46 @@
+# Reclient
+
+> Reclient integrates with an existing build system to enable remote execution and caching of build actions.
+
+Electron has a deployment of a [reclient](https://github.com/bazelbuild/reclient)
+compatible RBE Backend that is available to all Electron Maintainers.
+See the [Access](#access) section below for details on authentication. Non-maintainers
+will not have access to the cluster, but can sign in to receive a `Cache Only` token
+that gives access to the cache-only CAS backend. Using this should result in
+significantly faster build times .
+
+## Enabling Reclient
+
+Currently the only supported way to use Reclient is to use our [Build Tools](https://github.com/electron/build-tools).
+Reclient configuration is automatically included when you set up `build-tools`.
+
+If you have an existing config, you can just set `"reclient": "remote_exec"`
+in your config file.
+
+## Building with Reclient
+
+When you are using Reclient, you can run `autoninja` with a substantially higher `j`
+value than would normally be supported by your machine.
+
+Please do not set a value higher than **200**. The RBE system is monitored.
+Users found to be abusing it with unreasonable concurrency will be deactivated.
+
+```bash
+autoninja -C out/Testing electron -j 200
+```
+
+If you're using `build-tools`, appropriate `-j` values will automatically be used for you.
+
+## Access
+
+For security and cost reasons, access to Electron's RBE backend is currently restricted
+to Electron Maintainers.  If you want access, please head to `#access-requests` in
+Slack and ping `@infra-wg` to ask for it.  Please be aware that being a
+maintainer does not _automatically_ grant access. Access is determined on a
+case-by-case basis.
+
+## Support
+
+We do not provide support for usage of Reclient. Issues raised asking for help / having
+issues will _probably_ be closed without much reason. We do not have the capacity to handle
+that kind of support.

docs/fiddles/menus/customize-menus/main.js

@@ -102,7 +102,7 @@ const template = [
         })(),
         click: (item, focusedWindow) => {
           if (focusedWindow) {
-            focusedWindow.toggleDevTools()
+            focusedWindow.webContents.toggleDevTools()
           }
         }
       },

docs/tutorial/debugging-main-process.md

@@ -14,10 +14,10 @@ process:
 
 Electron will listen for V8 inspector protocol messages on the specified `port`,
 an external debugger will need to connect on this port. The default `port` is
-`5858`.
+`9229`.
 
 ```shell
-electron --inspect=5858 your/app
+electron --inspect=9229 your/app
 ```
 
 ### `--inspect-brk=[port]`

docs/tutorial/electron-timelines.md

@@ -9,6 +9,7 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 
 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
+| 30.0.0 |  2024-Feb-22 | 2024-Mar-20 | 2024-Apr-16 | 2024-Oct-15 | M124 | v20.9+ | ✅ |
 | 29.0.0 |  2023-Dec-07 | 2024-Jan-24 | 2024-Feb-20 | 2024-Aug-20 | M122 | v20.9 | ✅ |
 | 28.0.0 |  2023-Oct-11 | 2023-Nov-06 | 2023-Dec-05 | 2024-Jun-11 | M120 | v18.18 | ✅ |
 | 27.0.0 |  2023-Aug-17 | 2023-Sep-13 | 2023-Oct-10 | 2024-Apr-16 | M118 | v18.17 | ✅ |

docs/tutorial/quick-start.md

@@ -126,7 +126,7 @@ folder of your project:
 
 ```html
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="UTF-8">
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
@@ -420,9 +420,8 @@ window.addEventListener('DOMContentLoaded', () => {
 
 ```html
 <!--index.html-->
-
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="UTF-8">
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->

docs/tutorial/security.md

@@ -79,8 +79,8 @@ will be able to execute native code on the user's machine.
 Under no circumstances should you load and execute remote code with
 Node.js integration enabled. Instead, use only local files (packaged together
 with your application) to execute Node.js code. To display remote content, use
-the [`<webview>`][webview-tag] tag or [`BrowserView`][browser-view], make sure
-to disable the `nodeIntegration` and enable `contextIsolation`.
+the [`<webview>`][webview-tag] tag or a [`WebContentsView`][web-contents-view]
+and make sure to disable the `nodeIntegration` and enable `contextIsolation`.
 :::
 
 :::info Electron security warnings
@@ -168,7 +168,7 @@ This recommendation is the default behavior in Electron since 5.0.0.
 :::
 
 It is paramount that you do not enable Node.js integration in any renderer
-([`BrowserWindow`][browser-window], [`BrowserView`][browser-view], or
+([`BrowserWindow`][browser-window], [`WebContentsView`][web-contents-view], or
 [`<webview>`][webview-tag]) that loads remote content. The goal is to limit the
 powers you grant to remote content, thus making it dramatically more difficult
 for an attacker to harm your users should they gain the ability to execute
@@ -308,8 +308,8 @@ This recommendation is Electron's default.
 
 You may have already guessed that disabling the `webSecurity` property on a
 renderer process ([`BrowserWindow`][browser-window],
-[`BrowserView`][browser-view], or [`<webview>`][webview-tag]) disables crucial
-security features.
+[`WebContentsView`][web-contents-view], or [`<webview>`][webview-tag]) disables
+crucial security features.
 
 Do not disable `webSecurity` in production applications.
 
@@ -806,10 +806,10 @@ potential error cases, and refer to
 
 [breaking-changes]: ../breaking-changes.md
 [browser-window]: ../api/browser-window.md
-[browser-view]: ../api/browser-view.md
 [webview-tag]: ../api/webview-tag.md
+[web-contents-view]: ../api/web-contents-view.md
+[responsible-disclosure]: https://en.wikipedia.org/wiki/Responsible_disclosure
 [web-contents]: ../api/web-contents.md
 [window-open-handler]: ../api/web-contents.md#contentssetwindowopenhandlerhandler
 [will-navigate]: ../api/web-contents.md#event-will-navigate
 [open-external]: ../api/shell.md#shellopenexternalurl-options
-[responsible-disclosure]: https://en.wikipedia.org/wiki/Responsible_disclosure

docs/tutorial/tutorial-6-publishing-updating.md

@@ -152,7 +152,7 @@ command that can handle the version bumping and tagging for you.
 #### Bonus: Publishing in GitHub Actions
 
 Publishing locally can be painful, especially because you can only create distributables
-for your host operating system (i.e. you can't publish a Windows `.exe` file from macOS).
+for your host operating system (i.e. you can't publish a Window `.exe` file from macOS).
 
 A solution for this would be to publish your app via automation workflows
 such as [GitHub Actions][], which can run tasks in the

docs/tutorial/web-embeds.md

@@ -42,16 +42,15 @@ Compared to an `<iframe>`, `<webview>` tends to be slightly slower but offers
 much greater control in loading and communicating with the third-party content
 and handling various events.
 
-### BrowserViews
+### WebContentsView
 
-[BrowserViews](../api/browser-view.md) are not a part of the DOM - instead,
-they are created in and controlled by your Main process. They are simply
-another layer of web content on top of your existing window. This means
-that they are completely separate from your own `BrowserWindow` content and
-their position is not controlled by the DOM or CSS. Instead, it is controlled
-by setting the bounds in the Main process.
+[`WebContentsView`](../api/web-contents-view.md)s are not a part of the
+DOM—instead, they are created, controlled, positioned, and sized by your
+Main process. Using `WebContentsView`, you can combine and layer many pages
+together in the same [`BaseWindow`](../api/base-window.md).
 
-`BrowserViews` offer the greatest control over their contents, since they
-implement the `webContents` similarly to how the `BrowserWindow` does it.
-However, as `BrowserViews` are not a part of your DOM, but are rather overlaid
-on top of them, you will have to manage their position manually.
+`WebContentsView`s offer the greatest control over their contents, since they
+implement the `webContents` similarly to how `BrowserWindow` does it. However,
+as `WebContentsView`s are not elements inside the DOM, positioning them
+accurately with respect to DOM content requires coordination between the
+Main and Renderer processes.

filenames.auto.gni

@@ -4,6 +4,7 @@ auto_filenames = {
     "docs/api/accelerator.md",
     "docs/api/app.md",
     "docs/api/auto-updater.md",
+    "docs/api/base-window.md",
     "docs/api/browser-view.md",
     "docs/api/browser-window.md",
     "docs/api/client-request.md",
@@ -64,6 +65,8 @@ auto_filenames = {
     "docs/api/touch-bar.md",
     "docs/api/tray.md",
     "docs/api/utility-process.md",
+    "docs/api/view.md",
+    "docs/api/web-contents-view.md",
     "docs/api/web-contents.md",
     "docs/api/web-frame-main.md",
     "docs/api/web-frame.md",
@@ -71,6 +74,7 @@ auto_filenames = {
     "docs/api/web-utils.md",
     "docs/api/webview-tag.md",
     "docs/api/window-open.md",
+    "docs/api/structures/base-window-options.md",
     "docs/api/structures/bluetooth-device.md",
     "docs/api/structures/browser-window-options.md",
     "docs/api/structures/certificate-principal.md",
@@ -88,7 +92,6 @@ auto_filenames = {
     "docs/api/structures/gpu-feature-status.md",
     "docs/api/structures/hid-device.md",
     "docs/api/structures/input-event.md",
-    "docs/api/structures/io-counters.md",
     "docs/api/structures/ipc-main-event.md",
     "docs/api/structures/ipc-main-invoke-event.md",
     "docs/api/structures/ipc-renderer-event.md",

filenames.gni

@@ -34,7 +34,7 @@ filenames = {
     "shell/browser/notifications/linux/notification_presenter_linux.h",
     "shell/browser/relauncher_linux.cc",
     "shell/browser/ui/electron_desktop_window_tree_host_linux.cc",
-    "shell/browser/ui/file_dialog_linux.cc",
+    "shell/browser/ui/file_dialog_gtk.cc",
     "shell/browser/ui/gtk/menu_gtk.cc",
     "shell/browser/ui/gtk/menu_gtk.h",
     "shell/browser/ui/gtk/menu_util.cc",
@@ -118,6 +118,8 @@ filenames = {
   lib_sources_mac = [
     "shell/app/electron_main_delegate_mac.h",
     "shell/app/electron_main_delegate_mac.mm",
+    "shell/browser/animation_util.h",
+    "shell/browser/animation_util_mac.mm",
     "shell/browser/api/electron_api_app_mac.mm",
     "shell/browser/api/electron_api_menu_mac.h",
     "shell/browser/api/electron_api_menu_mac.mm",
@@ -141,8 +143,6 @@ filenames = {
     "shell/browser/mac/in_app_purchase_product.mm",
     "shell/browser/mac/in_app_purchase.h",
     "shell/browser/mac/in_app_purchase.mm",
-    "shell/browser/native_browser_view_mac.h",
-    "shell/browser/native_browser_view_mac.mm",
     "shell/browser/native_window_mac.h",
     "shell/browser/native_window_mac.mm",
     "shell/browser/notifications/mac/cocoa_notification.h",
@@ -209,8 +209,6 @@ filenames = {
   lib_sources_views = [
     "shell/browser/api/electron_api_menu_views.cc",
     "shell/browser/api/electron_api_menu_views.h",
-    "shell/browser/native_browser_view_views.cc",
-    "shell/browser/native_browser_view_views.h",
     "shell/browser/native_window_views.cc",
     "shell/browser/native_window_views.h",
     "shell/browser/ui/drag_util_views.cc",
@@ -255,8 +253,6 @@ filenames = {
     "shell/browser/api/electron_api_auto_updater.h",
     "shell/browser/api/electron_api_base_window.cc",
     "shell/browser/api/electron_api_base_window.h",
-    "shell/browser/api/electron_api_browser_view.cc",
-    "shell/browser/api/electron_api_browser_view.h",
     "shell/browser/api/electron_api_browser_window.cc",
     "shell/browser/api/electron_api_browser_window.h",
     "shell/browser/api/electron_api_content_tracing.cc",
@@ -336,6 +332,8 @@ filenames = {
     "shell/browser/api/save_page_handler.h",
     "shell/browser/api/ui_event.cc",
     "shell/browser/api/ui_event.h",
+    "shell/browser/api/views/electron_api_image_view.cc",
+    "shell/browser/api/views/electron_api_image_view.h",
     "shell/browser/auto_updater.cc",
     "shell/browser/auto_updater.h",
     "shell/browser/background_throttling_source.h",
@@ -411,8 +409,6 @@ filenames = {
     "shell/browser/media/media_device_id_salt.h",
     "shell/browser/microtasks_runner.cc",
     "shell/browser/microtasks_runner.h",
-    "shell/browser/native_browser_view.cc",
-    "shell/browser/native_browser_view.h",
     "shell/browser/native_window.cc",
     "shell/browser/native_window.h",
     "shell/browser/native_window_features.cc",
@@ -594,6 +590,8 @@ filenames = {
     "shell/common/gin_converters/hid_device_info_converter.h",
     "shell/common/gin_converters/image_converter.cc",
     "shell/common/gin_converters/image_converter.h",
+    "shell/common/gin_converters/login_item_settings_converter.cc",
+    "shell/common/gin_converters/login_item_settings_converter.h",
     "shell/common/gin_converters/media_converter.cc",
     "shell/common/gin_converters/media_converter.h",
     "shell/common/gin_converters/message_box_converter.cc",
@@ -764,6 +762,8 @@ filenames = {
     "shell/common/gin_converters/extension_converter.h",
     "shell/renderer/extensions/electron_extensions_dispatcher_delegate.cc",
     "shell/renderer/extensions/electron_extensions_dispatcher_delegate.h",
+    "shell/renderer/extensions/electron_extensions_renderer_api_provider.cc",
+    "shell/renderer/extensions/electron_extensions_renderer_api_provider.h",
     "shell/renderer/extensions/electron_extensions_renderer_client.cc",
     "shell/renderer/extensions/electron_extensions_renderer_client.h",
   ]

filenames.libcxx.gni

@@ -111,6 +111,7 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__algorithm/ranges_binary_search.h",
   "//third_party/libc++/src/include/__algorithm/ranges_clamp.h",
   "//third_party/libc++/src/include/__algorithm/ranges_contains.h",
+  "//third_party/libc++/src/include/__algorithm/ranges_contains_subrange.h",
   "//third_party/libc++/src/include/__algorithm/ranges_copy.h",
   "//third_party/libc++/src/include/__algorithm/ranges_copy_backward.h",
   "//third_party/libc++/src/include/__algorithm/ranges_copy_if.h",
@@ -291,6 +292,8 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__chrono/steady_clock.h",
   "//third_party/libc++/src/include/__chrono/system_clock.h",
   "//third_party/libc++/src/include/__chrono/time_point.h",
+  "//third_party/libc++/src/include/__chrono/time_zone.h",
+  "//third_party/libc++/src/include/__chrono/time_zone_link.h",
   "//third_party/libc++/src/include/__chrono/tzdb.h",
   "//third_party/libc++/src/include/__chrono/tzdb_list.h",
   "//third_party/libc++/src/include/__chrono/weekday.h",
@@ -428,9 +431,9 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__functional/weak_result_type.h",
   "//third_party/libc++/src/include/__fwd/array.h",
   "//third_party/libc++/src/include/__fwd/bit_reference.h",
+  "//third_party/libc++/src/include/__fwd/complex.h",
   "//third_party/libc++/src/include/__fwd/fstream.h",
-  "//third_party/libc++/src/include/__fwd/get.h",
-  "//third_party/libc++/src/include/__fwd/hash.h",
+  "//third_party/libc++/src/include/__fwd/functional.h",
   "//third_party/libc++/src/include/__fwd/ios.h",
   "//third_party/libc++/src/include/__fwd/istream.h",
   "//third_party/libc++/src/include/__fwd/mdspan.h",
@@ -489,9 +492,17 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__iterator/unreachable_sentinel.h",
   "//third_party/libc++/src/include/__iterator/wrap_iter.h",
   "//third_party/libc++/src/include/__locale",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/android.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/bsd_locale_defaults.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/fuchsia.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/ibm.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/locale_guard.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/musl.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/newlib.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/openbsd.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/win32.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api.h",
   "//third_party/libc++/src/include/__math/abs.h",
   "//third_party/libc++/src/include/__math/copysign.h",
   "//third_party/libc++/src/include/__math/error_functions.h",
@@ -571,6 +582,7 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__numeric/pstl_reduce.h",
   "//third_party/libc++/src/include/__numeric/pstl_transform_reduce.h",
   "//third_party/libc++/src/include/__numeric/reduce.h",
+  "//third_party/libc++/src/include/__numeric/saturation_arithmetic.h",
   "//third_party/libc++/src/include/__numeric/transform_exclusive_scan.h",
   "//third_party/libc++/src/include/__numeric/transform_inclusive_scan.h",
   "//third_party/libc++/src/include/__numeric/transform_reduce.h",
@@ -667,16 +679,9 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__string/char_traits.h",
   "//third_party/libc++/src/include/__string/constexpr_c_functions.h",
   "//third_party/libc++/src/include/__string/extern_template_lists.h",
-  "//third_party/libc++/src/include/__support/android/locale_bionic.h",
-  "//third_party/libc++/src/include/__support/fuchsia/xlocale.h",
   "//third_party/libc++/src/include/__support/ibm/gettod_zos.h",
   "//third_party/libc++/src/include/__support/ibm/locale_mgmt_zos.h",
   "//third_party/libc++/src/include/__support/ibm/nanosleep.h",
-  "//third_party/libc++/src/include/__support/ibm/xlocale.h",
-  "//third_party/libc++/src/include/__support/musl/xlocale.h",
-  "//third_party/libc++/src/include/__support/newlib/xlocale.h",
-  "//third_party/libc++/src/include/__support/openbsd/xlocale.h",
-  "//third_party/libc++/src/include/__support/win32/locale_win32.h",
   "//third_party/libc++/src/include/__support/xlocale/__nop_locale_mgmt.h",
   "//third_party/libc++/src/include/__support/xlocale/__posix_l_fallback.h",
   "//third_party/libc++/src/include/__support/xlocale/__strtonum_fallback.h",
@@ -689,10 +694,14 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__thread/id.h",
   "//third_party/libc++/src/include/__thread/jthread.h",
   "//third_party/libc++/src/include/__thread/poll_with_backoff.h",
+  "//third_party/libc++/src/include/__thread/support/c11.h",
+  "//third_party/libc++/src/include/__thread/support/external.h",
+  "//third_party/libc++/src/include/__thread/support/pthread.h",
+  "//third_party/libc++/src/include/__thread/support/windows.h",
+  "//third_party/libc++/src/include/__thread/support.h",
   "//third_party/libc++/src/include/__thread/this_thread.h",
   "//third_party/libc++/src/include/__thread/thread.h",
   "//third_party/libc++/src/include/__thread/timed_backoff_policy.h",
-  "//third_party/libc++/src/include/__threading_support",
   "//third_party/libc++/src/include/__tree",
   "//third_party/libc++/src/include/__tuple/make_tuple_types.h",
   "//third_party/libc++/src/include/__tuple/pair_like.h",
@@ -805,6 +814,7 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__type_traits/is_trivially_lexicographically_comparable.h",
   "//third_party/libc++/src/include/__type_traits/is_trivially_move_assignable.h",
   "//third_party/libc++/src/include/__type_traits/is_trivially_move_constructible.h",
+  "//third_party/libc++/src/include/__type_traits/is_trivially_relocatable.h",
   "//third_party/libc++/src/include/__type_traits/is_unbounded_array.h",
   "//third_party/libc++/src/include/__type_traits/is_union.h",
   "//third_party/libc++/src/include/__type_traits/is_unsigned.h",
@@ -915,7 +925,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/execution",
   "//third_party/libc++/src/include/expected",
   "//third_party/libc++/src/include/experimental/__config",
-  "//third_party/libc++/src/include/experimental/__memory",
   "//third_party/libc++/src/include/experimental/__simd/aligned_tag.h",
   "//third_party/libc++/src/include/experimental/__simd/declaration.h",
   "//third_party/libc++/src/include/experimental/__simd/reference.h",

lib/browser/api/base-window.ts

@@ -4,7 +4,7 @@ const { BaseWindow } = process._linkedBinding('electron_browser_base_window') as
 
 Object.setPrototypeOf(BaseWindow.prototype, EventEmitter.prototype);
 
-BaseWindow.prototype._init = function () {
+BaseWindow.prototype._init = function (this: TLWT) {
   // Avoid recursive require.
   const { app } = require('electron');
 
@@ -103,7 +103,7 @@ Object.defineProperty(BaseWindow.prototype, 'movable', {
 });
 
 BaseWindow.getFocusedWindow = () => {
-  return BaseWindow.getAllWindows().find((win) => win.isFocused());
+  return BaseWindow.getAllWindows().find((win) => win.isFocused()) ?? null;
 };
 
 module.exports = BaseWindow;

lib/browser/api/browser-view.ts

@@ -1,3 +1,120 @@
-const { BrowserView } = process._linkedBinding('electron_browser_browser_view');
+import { BrowserWindow, AutoResizeOptions, Rectangle, WebContentsView, WebPreferences, WebContents } from 'electron/main';
 
-export default BrowserView;
+const v8Util = process._linkedBinding('electron_common_v8_util');
+
+export default class BrowserView {
+  #webContentsView: WebContentsView;
+
+  // AutoResize state
+  #resizeListener: ((...args: any[]) => void) | null = null;
+  #lastWindowSize: {width: number, height: number} = { width: 0, height: 0 };
+  #autoResizeFlags: AutoResizeOptions = {};
+
+  constructor (options: {webPreferences: WebPreferences, webContents?: WebContents} = { webPreferences: {} }) {
+    const { webPreferences = {}, webContents } = options;
+    if (webContents) {
+      v8Util.setHiddenValue(webPreferences, 'webContents', webContents);
+    }
+    webPreferences.type = 'browserView';
+    this.#webContentsView = new WebContentsView({ webPreferences });
+  }
+
+  get webContents () {
+    return this.#webContentsView.webContents;
+  }
+
+  setBounds (bounds: Rectangle) {
+    this.#webContentsView.setBounds(bounds);
+    this.#autoHorizontalProportion = null;
+    this.#autoVerticalProportion = null;
+  }
+
+  getBounds () {
+    return this.#webContentsView.getBounds();
+  }
+
+  setAutoResize (options: AutoResizeOptions) {
+    if (options == null || typeof options !== 'object') { throw new Error('Invalid auto resize options'); }
+    this.#autoResizeFlags = {
+      width: !!options.width,
+      height: !!options.height,
+      horizontal: !!options.horizontal,
+      vertical: !!options.vertical
+    };
+    this.#autoHorizontalProportion = null;
+    this.#autoVerticalProportion = null;
+  }
+
+  setBackgroundColor (color: string) {
+    this.#webContentsView.setBackgroundColor(color);
+  }
+
+  // Internal methods
+  get ownerWindow (): BrowserWindow | null {
+    return !this.webContents.isDestroyed() ? this.webContents.getOwnerBrowserWindow() : null;
+  }
+
+  set ownerWindow (w: BrowserWindow | null) {
+    if (this.webContents.isDestroyed()) return;
+    const oldWindow = this.webContents.getOwnerBrowserWindow();
+    if (oldWindow && this.#resizeListener) {
+      oldWindow.off('resize', this.#resizeListener);
+      this.#resizeListener = null;
+    }
+    this.webContents._setOwnerWindow(w);
+    if (w) {
+      this.#lastWindowSize = w.getBounds();
+      w.on('resize', this.#resizeListener = this.#autoResize.bind(this));
+    }
+  }
+
+  #autoHorizontalProportion: {width: number, left: number} | null = null;
+  #autoVerticalProportion: {height: number, top: number} | null = null;
+  #autoResize () {
+    if (!this.ownerWindow) throw new Error('Electron bug: #autoResize called without owner window');
+    if (this.#autoResizeFlags.horizontal && this.#autoHorizontalProportion == null) {
+      const viewBounds = this.#webContentsView.getBounds();
+      this.#autoHorizontalProportion = {
+        width: this.#lastWindowSize.width / viewBounds.width,
+        left: this.#lastWindowSize.width / viewBounds.x
+      };
+    }
+    if (this.#autoResizeFlags.vertical && this.#autoVerticalProportion == null) {
+      const viewBounds = this.#webContentsView.getBounds();
+      this.#autoVerticalProportion = {
+        height: this.#lastWindowSize.height / viewBounds.height,
+        top: this.#lastWindowSize.height / viewBounds.y
+      };
+    }
+    const newBounds = this.ownerWindow.getBounds();
+    let widthDelta = newBounds.width - this.#lastWindowSize.width;
+    let heightDelta = newBounds.height - this.#lastWindowSize.height;
+    if (!this.#autoResizeFlags.width) widthDelta = 0;
+    if (!this.#autoResizeFlags.height) heightDelta = 0;
+
+    const newViewBounds = this.#webContentsView.getBounds();
+    if (widthDelta || heightDelta) {
+      this.#webContentsView.setBounds({
+        ...newViewBounds,
+        width: newViewBounds.width + widthDelta,
+        height: newViewBounds.height + heightDelta
+      });
+    }
+
+    if (this.#autoHorizontalProportion) {
+      newViewBounds.width = newBounds.width / this.#autoHorizontalProportion.width;
+      newViewBounds.x = newBounds.width / this.#autoHorizontalProportion.left;
+    }
+    if (this.#autoVerticalProportion) {
+      newViewBounds.height = newBounds.height / this.#autoVerticalProportion.height;
+      newViewBounds.y = newBounds.y / this.#autoVerticalProportion.top;
+    }
+    if (this.#autoHorizontalProportion || this.#autoVerticalProportion) {
+      this.#webContentsView.setBounds(newViewBounds);
+    }
+  }
+
+  get webContentsView () {
+    return this.#webContentsView;
+  }
+}

lib/browser/api/browser-window.ts

@@ -1,4 +1,4 @@
-import { BaseWindow, WebContents, BrowserView, TouchBar } from 'electron/main';
+import { BaseWindow, WebContents, TouchBar, BrowserView } from 'electron/main';
 import type { BrowserWindow as BWT } from 'electron/main';
 const { BrowserWindow } = process._linkedBinding('electron_browser_window') as { BrowserWindow: typeof BWT };
 
@@ -6,7 +6,7 @@ Object.setPrototypeOf(BrowserWindow.prototype, BaseWindow.prototype);
 
 BrowserWindow.prototype._init = function (this: BWT) {
   // Call parent class's _init.
-  BaseWindow.prototype._init.call(this);
+  (BaseWindow.prototype as any)._init.call(this);
 
   // Avoid recursive require.
   const { app } = require('electron');
@@ -52,6 +52,12 @@ BrowserWindow.prototype._init = function (this: BWT) {
     this.on(event as any, visibilityChanged);
   }
 
+  this._browserViews = [];
+
+  this.on('close', () => {
+    this._browserViews.forEach(b => b.webContents?.close({ waitForBeforeUnload: true }));
+  });
+
   // Notify the creation of the window.
   app.emit('browser-window-created', { preventDefault () {} }, this);
 
@@ -168,4 +174,42 @@ BrowserWindow.prototype.setBackgroundThrottling = function (allowed: boolean) {
   return this.webContents.setBackgroundThrottling(allowed);
 };
 
+BrowserWindow.prototype.addBrowserView = function (browserView: BrowserView) {
+  if (browserView.ownerWindow) { browserView.ownerWindow.removeBrowserView(browserView); }
+  this.contentView.addChildView(browserView.webContentsView);
+  browserView.ownerWindow = this;
+  browserView.webContents._setOwnerWindow(this);
+  this._browserViews.push(browserView);
+};
+
+BrowserWindow.prototype.setBrowserView = function (browserView: BrowserView) {
+  this._browserViews.forEach(bv => {
+    this.removeBrowserView(bv);
+  });
+  if (browserView) { this.addBrowserView(browserView); }
+};
+
+BrowserWindow.prototype.removeBrowserView = function (browserView: BrowserView) {
+  const idx = this._browserViews.indexOf(browserView);
+  if (idx >= 0) {
+    this.contentView.removeChildView(browserView.webContentsView);
+    browserView.ownerWindow = null;
+    this._browserViews.splice(idx, 1);
+  }
+};
+
+BrowserWindow.prototype.getBrowserView = function () {
+  if (this._browserViews.length > 1) { throw new Error('This BrowserWindow has multiple BrowserViews, use getBrowserViews() instead'); }
+  return this._browserViews[0] ?? null;
+};
+
+BrowserWindow.prototype.getBrowserViews = function () {
+  return [...this._browserViews];
+};
+
+BrowserWindow.prototype.setTopBrowserView = function (browserView: BrowserView) {
+  if (browserView.ownerWindow !== this) { throw new Error('Given BrowserView is not attached to the window'); }
+  this.addBrowserView(browserView);
+};
+
 module.exports = BrowserWindow;

lib/browser/api/module-list.ts

@@ -14,6 +14,7 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'dialog', loader: () => require('./dialog') },
   { name: 'globalShortcut', loader: () => require('./global-shortcut') },
   { name: 'ipcMain', loader: () => require('./ipc-main') },
+  { name: 'ImageView', loader: () => require('./views/image-view') },
   { name: 'inAppPurchase', loader: () => require('./in-app-purchase') },
   { name: 'Menu', loader: () => require('./menu') },
   { name: 'MenuItem', loader: () => require('./menu-item') },
@@ -39,9 +40,3 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'WebContentsView', loader: () => require('./web-contents-view') },
   { name: 'webFrameMain', loader: () => require('./web-frame-main') }
 ];
-
-if (BUILDFLAG(ENABLE_VIEWS_API)) {
-  browserModuleList.push(
-    { name: 'ImageView', loader: () => require('./views/image-view') }
-  );
-}

lib/browser/api/view.ts

@@ -1,3 +1,6 @@
+import { EventEmitter } from 'events';
 const { View } = process._linkedBinding('electron_browser_view');
 
+Object.setPrototypeOf((View as any).prototype, EventEmitter.prototype);
+
 export default View;

lib/browser/api/web-contents.ts

@@ -342,24 +342,26 @@ WebContents.prototype.loadFile = function (filePath, options = {}) {
   }));
 };
 
+type LoadError = { errorCode: number, errorDescription: string, url: string };
+
 WebContents.prototype.loadURL = function (url, options) {
   const p = new Promise<void>((resolve, reject) => {
     const resolveAndCleanup = () => {
       removeListeners();
       resolve();
     };
-    const rejectAndCleanup = (errorCode: number, errorDescription: string, url: string) => {
+    let error: LoadError | undefined;
+    const rejectAndCleanup = ({ errorCode, errorDescription, url }: LoadError) => {
       const err = new Error(`${errorDescription} (${errorCode}) loading '${typeof url === 'string' ? url.substr(0, 2048) : url}'`);
       Object.assign(err, { errno: errorCode, code: errorDescription, url });
       removeListeners();
       reject(err);
     };
     const finishListener = () => {
-      resolveAndCleanup();
-    };
-    const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
-      if (isMainFrame) {
-        rejectAndCleanup(errorCode, errorDescription, validatedURL);
+      if (error) {
+        rejectAndCleanup(error);
+      } else {
+        resolveAndCleanup();
       }
     };
 
@@ -377,12 +379,20 @@ WebContents.prototype.loadURL = function (url, options) {
           // considered navigation events but are triggered with isSameDocument.
           // We can ignore these to allow virtual routing on page load as long
           // as the routing does not leave the document
-          return rejectAndCleanup(-3, 'ERR_ABORTED', url);
+          return rejectAndCleanup({ errorCode: -3, errorDescription: 'ERR_ABORTED', url });
         }
         browserInitiatedInPageNavigation = navigationStarted && isSameDocument;
         navigationStarted = true;
       }
     };
+    const failListener = (event: Electron.Event, errorCode: number, errorDescription: string, validatedURL: string, isMainFrame: boolean) => {
+      if (!error && isMainFrame) {
+        error = { errorCode, errorDescription, url: validatedURL };
+      }
+      if (!navigationStarted && isMainFrame) {
+        finishListener();
+      }
+    };
     const stopLoadingListener = () => {
       // By the time we get here, either 'finish' or 'fail' should have fired
       // if the navigation occurred. However, in some situations (e.g. when
@@ -392,7 +402,10 @@ WebContents.prototype.loadURL = function (url, options) {
       // TODO(jeremy): enumerate all the cases in which this can happen. If
       // the only one is with a bad scheme, perhaps ERR_INVALID_ARGUMENT
       // would be more appropriate.
-      rejectAndCleanup(-2, 'ERR_FAILED', url);
+      if (!error) {
+        error = { errorCode: -2, errorDescription: 'ERR_FAILED', url: url };
+      }
+      finishListener();
     };
     const finishListenerWhenUserInitiatedNavigation = () => {
       if (!browserInitiatedInPageNavigation) {
@@ -602,6 +615,16 @@ WebContents.prototype._init = function () {
     }
   });
 
+  this.on('-before-unload-fired' as any, function (this: Electron.WebContents, event: Electron.Event, proceed: boolean) {
+    const type = this.getType();
+    // These are the "interactive" types, i.e. ones a user might be looking at.
+    // All other types should ignore the "proceed" signal and unload
+    // regardless.
+    if (type === 'window' || type === 'offscreen' || type === 'browserView') {
+      if (!proceed) { return event.preventDefault(); }
+    }
+  });
+
   // The devtools requests the webContents to reload.
   this.on('devtools-reload-page', function (this: Electron.WebContents) {
     this.reload();
@@ -786,7 +809,7 @@ WebContents.prototype._init = function () {
     const promise = parent && !prefs.offscreen ? dialog.showMessageBox(parent, options) : dialog.showMessageBox(options);
     try {
       const result = await promise;
-      if (abortController.signal.aborted) return;
+      if (abortController.signal.aborted || this.isDestroyed()) return;
       if (result.checkboxChecked) originCounts.set(origin, -1);
       return callback(result.response === 0, '');
     } finally {

lib/browser/init.ts

@@ -151,6 +151,10 @@ require('@electron/internal/browser/api/web-contents');
 // Load web-frame-main module to ensure it is populated on app ready
 require('@electron/internal/browser/api/web-frame-main');
 
+// Required because `new BrowserWindow` calls some WebContentsView stuff, so
+// the inheritance needs to be set up before that happens.
+require('@electron/internal/browser/api/web-contents-view');
+
 // Set main startup script of the app.
 const mainStartupScript = packageJson.main || 'index.js';
 

patches/DirectXShaderCompiler/.patches

@@ -1,13 +0,0 @@
-cherry-pick-a65e511a14b4.patch
-cherry-pick-bc18aec94c82.patch
-cherry-pick-bd7aa9779873.patch
-cherry-pick-2a434fd0af6b.patch
-cherry-pick-867c1001637e.patch
-cherry-pick-0b785e88fefa.patch
-cherry-pick-511cfef8e050.patch
-cherry-pick-93c3cf1c787f.patch
-cherry-pick-33051b084850.patch
-cherry-pick-b845fed99111.patch
-cherry-pick-771e74ab497d.patch
-cherry-pick-8f07d39227f6.patch
-cherry-pick-b3c64851765c.patch

patches/DirectXShaderCompiler/cherry-pick-0b785e88fefa.patch

@@ -1,523 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Fri, 24 May 2024 15:51:26 -0400
-Subject: Fix dxil-remove-dead-blocks removing switch with multiple same
- successor (#6610)
-
-Given a switch with a constant condition and all cases the same
-(branching to the same successor), dxil-remove-dead-blocks would
-incorrectly remove the switch when replacing it with a branch, by
-forgetting to remove the N-1 incoming values to the PHIs in the
-successor block.
-
-Bug: chromium:338071106
-Change-Id: Iaa2c42642f3e370afd19d88c96c81056c16349b6
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5570270
-Reviewed-by: Ben Clayton <bclayton@chromium.org>
-Reviewed-by: James Price <jrprice@google.com>
-
-diff --git a/lib/Transforms/Scalar/DxilRemoveDeadBlocks.cpp b/lib/Transforms/Scalar/DxilRemoveDeadBlocks.cpp
-index 54308eed2e018903e518be4a5ff809e080be78c0..9a87f4e6740c8da0522c6bf00f2a365f838cb3c0 100644
---- a/lib/Transforms/Scalar/DxilRemoveDeadBlocks.cpp
-+++ b/lib/Transforms/Scalar/DxilRemoveDeadBlocks.cpp
-@@ -35,6 +35,7 @@
- using namespace llvm;
- using namespace hlsl;
- 
-+// Removes BB from PHI nodes in SuccBB, deleting the PHI nodes if empty.
- static void RemoveIncomingValueFrom(BasicBlock *SuccBB, BasicBlock *BB) {
-   for (auto inst_it = SuccBB->begin(); inst_it != SuccBB->end();) {
-     Instruction *I = &*(inst_it++);
-@@ -105,6 +106,8 @@ bool DeadBlockDeleter::Run(Function &F, DxilValueCache *DVC) {
-     } else if (SwitchInst *Switch = dyn_cast<SwitchInst>(BB->getTerminator())) {
-       Value *Cond = Switch->getCondition();
-       BasicBlock *Succ = nullptr;
-+      // If the condition to Switch is constant, replace Switch with a branch
-+      // to the current case successor.
-       if (ConstantInt *ConstCond = DVC->GetConstInt(Cond)) {
-         Succ = hlsl::dxilutil::GetSwitchSuccessorForCond(Switch, ConstCond);
-       }
-@@ -112,16 +115,32 @@ bool DeadBlockDeleter::Run(Function &F, DxilValueCache *DVC) {
-       if (Succ) {
-         Add(Succ);
- 
-+        // Create branch from BB to Succ that will replace Switch.
-+        // This adds BB to preds of Succ.
-         BranchInst *NewBr = BranchInst::Create(Succ, BB);
-         hlsl::DxilMDHelper::CopyMetadata(*NewBr, *Switch);
- 
-+        // For any successors we're not going to, remove incoming block BB from
-+        // PHI nodes in those successors.
-+        unsigned numSucc = 0;
-         for (unsigned i = 0; i < Switch->getNumSuccessors(); i++) {
-           BasicBlock *NotSucc = Switch->getSuccessor(i);
--          if (NotSucc != Succ) {
-+          if (NotSucc != Succ)
-             RemoveIncomingValueFrom(NotSucc, BB);
--          }
-+          else
-+            ++numSucc;
-+        }
-+
-+        // We're replacing Switch with a single unconditional branch. If Switch
-+        // has N cases with the same Succ, we need to remove N-1 incoming values
-+        // of BB from the PHI nodes in Succ. This ensures that the preds of Succ
-+        // match the ones in its PHIs.
-+        for (unsigned i = 1; i < numSucc; i++) {
-+          RemoveIncomingValueFrom(Succ, BB);
-         }
- 
-+        // Finally, erase Switch, which will remove BB as pred from all
-+        // successors.
-         Switch->eraseFromParent();
-         Switch = nullptr;
-         Changed = true;
-diff --git a/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.hlsl b/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.hlsl
-new file mode 100644
-index 0000000000000000000000000000000000000000..43c3510b2ce18b15ff74a0db4697898da807f49f
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.hlsl
-@@ -0,0 +1,68 @@
-+// Test switch with multiple same successors
-+// RUN: %dxc -T ps_6_6 %s | FileCheck %s
-+
-+// This test used to fail with validation errors:
-+//
-+// error: validation errors
-+// error: Module bitcode is invalid.
-+// error: PHINode should have one entry for each predecessor of its parent basic block!
-+//   %22 = phi i32 [ 1, %20 ], [ 1, %20 ], [ 1, %20 ], [ 1, %20 ], [ %11, %13 ]
-+// PHINode should have one entry for each predecessor of its parent basic block!
-+//   %28 = phi i32 [ 1, %26 ], [ 1, %26 ], [ 1, %26 ], [ 1, %26 ], [ %22, %24 ]
-+// PHINode should have one entry for each predecessor of its parent basic block!
-+//   %34 = phi i32 [ 1, %32 ], [ 1, %32 ], [ 1, %32 ], [ 1, %32 ], [ %28, %30 ]
-+// PHINode should have one entry for each predecessor of its parent basic block!
-+//   %47 = phi i32 [ 1, %45 ], [ 1, %45 ], [ 1, %45 ], [ 1, %45 ], [ %41, %43 ]
-+//
-+// This was fixed in dxil-remove-dead-blocks. See switch-with-multiple-same-successor.ll
-+// for the pass-specific checks. Here, we just want to make sure dxc compiles this without error.
-+
-+// CHECK: @main
-+
-+ByteAddressBuffer g_buff : register(t0);
-+
-+struct retval {
-+  float4 value : SV_Target0;
-+};
-+
-+retval main() {
-+  float4 g = asfloat(g_buff.Load4(0u));
-+  bool do_discard = false;
-+
-+  for (int i = 0; i < 10; ++i) {
-+    if (g.x != 0.0f)
-+      continue;
-+
-+    // Switch with the same successor in all cases
-+    switch(i) {
-+      case 1: {
-+        g.x = g.x;
-+        break;
-+      }
-+      case 2: {
-+        g.x = g.x;
-+        break;
-+      }
-+      case 3: {
-+        g.x = g.x;
-+        break;
-+      }
-+      // Skip 'case 4' to avoid case range combining
-+      case 5: {
-+        g.x = g.x;
-+        break;
-+      }
-+    }
-+    if (i == 6) {
-+      break;
-+    }
-+    g.x = atan2(1.0f, g.x);
-+    do_discard = true;
-+  }
-+
-+  if (do_discard) {
-+    discard;
-+  }
-+
-+  return (retval)0;
-+}
-diff --git a/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.ll b/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..d3e7e2f1e40c816c4ed28bfc45a1569e130f472c
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.ll
-@@ -0,0 +1,369 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -dxil-remove-dead-blocks -S | FileCheck %s
-+
-+; Validate that a switch with a constant condition and multiple of the same successor
-+; is correctly removed, ensuring that PHIs in the successor are properly updated.
-+; For instance, in:
-+;
-+;
-+; if.end.1:                                         ; preds = %for.inc
-+;   switch i32 1, label %sw.epilog.1 [
-+;     i32 1, label %dx.struct_exit.new_exiting.1
-+;     i32 2, label %dx.struct_exit.new_exiting.1
-+;     i32 3, label %dx.struct_exit.new_exiting.1
-+;     i32 5, label %dx.struct_exit.new_exiting.1
-+;   ], !dbg !31 ; line:23 col:5
-+;
-+; sw.epilog.1:                                      ; preds = %if.end.1
-+;   br label %dx.struct_exit.new_exiting.1
-+;
-+; dx.struct_exit.new_exiting.1:                     ; preds = %sw.epilog.1, %if.end.1, %if.end.1, %if.end.1, %if.end.1, %for.inc
-+;   %dx.struct_exit.prop.1 = phi i32 [ %do_discard.2, %sw.epilog.1 ], [ 0, %if.end.1 ], [ 0, %if.end.1 ], [ 0, %if.end.1 ], [ 0, %if.end.1 ], [ 0, %for.inc ]
-+;   %do_discard.2.1 = phi i32 [ 1, %sw.epilog.1 ], [ 1, %if.end.1 ], [ 1, %if.end.1 ], [ 1, %if.end.1 ], [ 1, %if.end.1 ], [ %do_discard.2, %for.inc ]
-+;   %g.2.i0.1 = phi float [ 0x3FF921FB60000000, %sw.epilog.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ %g.2.i0, %for.inc ]
-+;   br i1 false, label %cleanup, label %for.inc.1
-+;
-+;
-+; After dxil-remove-dead-blocks, the multiple `%if.end.1` in preds and in the two phi instructions should be removed,
-+; and only one instance should be left.
-+
-+; CHECK:      if.end.1:                                         ; preds = %for.inc
-+; CHECK-NEXT:   br label %dx.struct_exit.new_exiting.1
-+
-+; CHECK:     dx.struct_exit.new_exiting.1:                     ; preds = %if.end.1, %for.inc
-+; CHECK-NEXT:  %do_discard.2.1 = phi i32 [ 1, %if.end.1 ], [ %do_discard.2, %for.inc ]
-+; CHECK-NEXT:  %g.2.i0.1 = phi float [ 0x3FF921FB60000000, %if.end.1 ], [ %g.2.i0, %for.inc ]
-+
-+;
-+; Output signature:
-+;
-+; Name                 Index             InterpMode DynIdx
-+; -------------------- ----- ---------------------- ------
-+; SV_Target                0
-+;
-+; Buffer Definitions:
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; g_buff                            texture    byte         r/o      T0             t0     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%struct.ByteAddressBuffer = type { i32 }
-+%dx.types.Handle = type { i8* }
-+%dx.types.ResourceProperties = type { i32, i32 }
-+%dx.types.ResRet.i32 = type { i32, i32, i32, i32, i32 }
-+%struct.retval = type { <4 x float> }
-+
-+@"\01?g_buff@@3UByteAddressBuffer@@A" = external global %struct.ByteAddressBuffer, align 4
-+@llvm.used = appending global [1 x i8*] [i8* bitcast (%struct.ByteAddressBuffer* @"\01?g_buff@@3UByteAddressBuffer@@A" to i8*)], section "llvm.metadata"
-+
-+; Function Attrs: nounwind
-+define void @main(<4 x float>* noalias nocapture readnone) #0 {
-+for.body.lr.ph:
-+  %1 = load %struct.ByteAddressBuffer, %struct.ByteAddressBuffer* @"\01?g_buff@@3UByteAddressBuffer@@A", align 4, !dbg !23 ; line:15 col:22
-+  %2 = call %dx.types.Handle @dx.op.createHandleForLib.struct.ByteAddressBuffer(i32 160, %struct.ByteAddressBuffer %1), !dbg !23 ; line:15 col:22  ; CreateHandleForLib(Resource)
-+  %3 = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %2, %dx.types.ResourceProperties { i32 11, i32 0 }), !dbg !23 ; line:15 col:22  ; AnnotateHandle(res,props)  resource: ByteAddressBuffer
-+  %RawBufferLoad = call %dx.types.ResRet.i32 @dx.op.rawBufferLoad.i32(i32 139, %dx.types.Handle %3, i32 0, i32 undef, i8 15, i32 4), !dbg !23 ; line:15 col:22  ; RawBufferLoad(srv,index,elementOffset,mask,alignment)
-+  %4 = extractvalue %dx.types.ResRet.i32 %RawBufferLoad, 0, !dbg !23 ; line:15 col:22
-+  %.i0 = bitcast i32 %4 to float, !dbg !27 ; line:15 col:14
-+  br label %for.body, !dbg !28 ; line:18 col:3
-+
-+for.body:                                         ; preds = %for.body.lr.ph
-+  %cmp3 = fcmp fast une float %.i0, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3, label %dx.struct_exit.new_exiting, label %if.end, !dbg !30 ; line:19 col:9
-+
-+if.end:                                           ; preds = %for.body
-+  switch i32 0, label %sw.epilog [
-+    i32 1, label %dx.struct_exit.new_exiting
-+    i32 2, label %dx.struct_exit.new_exiting
-+    i32 3, label %dx.struct_exit.new_exiting
-+    i32 5, label %dx.struct_exit.new_exiting
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog:                                        ; preds = %if.end
-+  br label %dx.struct_exit.new_exiting
-+
-+dx.struct_exit.new_exiting:                       ; preds = %sw.epilog, %if.end, %if.end, %if.end, %if.end, %for.body
-+  %do_discard.2 = phi i32 [ 0, %for.body ], [ 1, %if.end ], [ 1, %if.end ], [ 1, %if.end ], [ 1, %if.end ], [ 1, %sw.epilog ]
-+  %g.2.i0 = phi float [ %.i0, %for.body ], [ 0x3FF921FB60000000, %if.end ], [ 0x3FF921FB60000000, %if.end ], [ 0x3FF921FB60000000, %if.end ], [ 0x3FF921FB60000000, %if.end ], [ 0x3FF921FB60000000, %sw.epilog ]
-+  br i1 false, label %cleanup, label %for.inc
-+
-+for.inc:                                          ; preds = %dx.struct_exit.new_exiting
-+  %cmp3.1 = fcmp fast une float %g.2.i0, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.1, label %dx.struct_exit.new_exiting.1, label %if.end.1, !dbg !30 ; line:19 col:9
-+
-+cleanup:                                          ; preds = %for.inc.9, %dx.struct_exit.new_exiting.9, %dx.struct_exit.new_exiting.8, %dx.struct_exit.new_exiting.7, %dx.struct_exit.new_exiting.6, %dx.struct_exit.new_exiting.5, %dx.struct_exit.new_exiting.4, %dx.struct_exit.new_exiting.3, %dx.struct_exit.new_exiting.2, %dx.struct_exit.new_exiting.1, %dx.struct_exit.new_exiting
-+  %do_discard.3 = phi i32 [ 0, %dx.struct_exit.new_exiting ], [ %dx.struct_exit.prop.1, %dx.struct_exit.new_exiting.1 ], [ %dx.struct_exit.prop.2, %dx.struct_exit.new_exiting.2 ], [ %dx.struct_exit.prop.3, %dx.struct_exit.new_exiting.3 ], [ %dx.struct_exit.prop.4, %dx.struct_exit.new_exiting.4 ], [ %dx.struct_exit.prop.5, %dx.struct_exit.new_exiting.5 ], [ %dx.struct_exit.prop.6, %dx.struct_exit.new_exiting.6 ], [ %dx.struct_exit.prop.7, %dx.struct_exit.new_exiting.7 ], [ %dx.struct_exit.prop.8, %dx.struct_exit.new_exiting.8 ], [ %dx.struct_exit.prop.9, %dx.struct_exit.new_exiting.9 ], [ %do_discard.2.9, %for.inc.9 ]
-+  %tobool15 = icmp eq i32 %do_discard.3, 0, !dbg !32 ; line:49 col:7
-+  br i1 %tobool15, label %if.end.17, label %if.then.16, !dbg !32 ; line:49 col:7
-+
-+if.then.16:                                       ; preds = %cleanup
-+  call void @dx.op.discard(i32 82, i1 true), !dbg !33 ; line:49 col:19  ; Discard(condition)
-+  br label %if.end.17, !dbg !34 ; line:51 col:3
-+
-+if.end.17:                                        ; preds = %cleanup, %if.then.16
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float 0.000000e+00), !dbg !35 ; line:53 col:18  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float 0.000000e+00), !dbg !35 ; line:53 col:18  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float 0.000000e+00), !dbg !35 ; line:53 col:18  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float 0.000000e+00), !dbg !35 ; line:53 col:18  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  ret void, !dbg !36 ; line:54 col:1
-+
-+if.end.1:                                         ; preds = %for.inc
-+  switch i32 1, label %sw.epilog.1 [
-+    i32 1, label %dx.struct_exit.new_exiting.1
-+    i32 2, label %dx.struct_exit.new_exiting.1
-+    i32 3, label %dx.struct_exit.new_exiting.1
-+    i32 5, label %dx.struct_exit.new_exiting.1
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.1:                                      ; preds = %if.end.1
-+  br label %dx.struct_exit.new_exiting.1
-+
-+dx.struct_exit.new_exiting.1:                     ; preds = %sw.epilog.1, %if.end.1, %if.end.1, %if.end.1, %if.end.1, %for.inc
-+  %dx.struct_exit.prop.1 = phi i32 [ %do_discard.2, %sw.epilog.1 ], [ 0, %if.end.1 ], [ 0, %if.end.1 ], [ 0, %if.end.1 ], [ 0, %if.end.1 ], [ 0, %for.inc ]
-+  %do_discard.2.1 = phi i32 [ 1, %sw.epilog.1 ], [ 1, %if.end.1 ], [ 1, %if.end.1 ], [ 1, %if.end.1 ], [ 1, %if.end.1 ], [ %do_discard.2, %for.inc ]
-+  %g.2.i0.1 = phi float [ 0x3FF921FB60000000, %sw.epilog.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ 0x3FF921FB60000000, %if.end.1 ], [ %g.2.i0, %for.inc ]
-+  br i1 false, label %cleanup, label %for.inc.1
-+
-+for.inc.1:                                        ; preds = %dx.struct_exit.new_exiting.1
-+  %cmp3.2 = fcmp fast une float %g.2.i0.1, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.2, label %dx.struct_exit.new_exiting.2, label %if.end.2, !dbg !30 ; line:19 col:9
-+
-+if.end.2:                                         ; preds = %for.inc.1
-+  switch i32 2, label %sw.epilog.2 [
-+    i32 1, label %dx.struct_exit.new_exiting.2
-+    i32 2, label %dx.struct_exit.new_exiting.2
-+    i32 3, label %dx.struct_exit.new_exiting.2
-+    i32 5, label %dx.struct_exit.new_exiting.2
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.2:                                      ; preds = %if.end.2
-+  br label %dx.struct_exit.new_exiting.2
-+
-+dx.struct_exit.new_exiting.2:                     ; preds = %sw.epilog.2, %if.end.2, %if.end.2, %if.end.2, %if.end.2, %for.inc.1
-+  %dx.struct_exit.prop.2 = phi i32 [ %do_discard.2.1, %sw.epilog.2 ], [ 0, %if.end.2 ], [ 0, %if.end.2 ], [ 0, %if.end.2 ], [ 0, %if.end.2 ], [ 0, %for.inc.1 ]
-+  %do_discard.2.2 = phi i32 [ 1, %sw.epilog.2 ], [ 1, %if.end.2 ], [ 1, %if.end.2 ], [ 1, %if.end.2 ], [ 1, %if.end.2 ], [ %do_discard.2.1, %for.inc.1 ]
-+  %g.2.i0.2 = phi float [ 0x3FF921FB60000000, %sw.epilog.2 ], [ 0x3FF921FB60000000, %if.end.2 ], [ 0x3FF921FB60000000, %if.end.2 ], [ 0x3FF921FB60000000, %if.end.2 ], [ 0x3FF921FB60000000, %if.end.2 ], [ %g.2.i0.1, %for.inc.1 ]
-+  br i1 false, label %cleanup, label %for.inc.2
-+
-+for.inc.2:                                        ; preds = %dx.struct_exit.new_exiting.2
-+  %cmp3.3 = fcmp fast une float %g.2.i0.2, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.3, label %dx.struct_exit.new_exiting.3, label %if.end.3, !dbg !30 ; line:19 col:9
-+
-+if.end.3:                                         ; preds = %for.inc.2
-+  switch i32 3, label %sw.epilog.3 [
-+    i32 1, label %dx.struct_exit.new_exiting.3
-+    i32 2, label %dx.struct_exit.new_exiting.3
-+    i32 3, label %dx.struct_exit.new_exiting.3
-+    i32 5, label %dx.struct_exit.new_exiting.3
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.3:                                      ; preds = %if.end.3
-+  br label %dx.struct_exit.new_exiting.3
-+
-+dx.struct_exit.new_exiting.3:                     ; preds = %sw.epilog.3, %if.end.3, %if.end.3, %if.end.3, %if.end.3, %for.inc.2
-+  %dx.struct_exit.prop.3 = phi i32 [ %do_discard.2.2, %sw.epilog.3 ], [ 0, %if.end.3 ], [ 0, %if.end.3 ], [ 0, %if.end.3 ], [ 0, %if.end.3 ], [ 0, %for.inc.2 ]
-+  %do_discard.2.3 = phi i32 [ 1, %sw.epilog.3 ], [ 1, %if.end.3 ], [ 1, %if.end.3 ], [ 1, %if.end.3 ], [ 1, %if.end.3 ], [ %do_discard.2.2, %for.inc.2 ]
-+  %g.2.i0.3 = phi float [ 0x3FF921FB60000000, %sw.epilog.3 ], [ 0x3FF921FB60000000, %if.end.3 ], [ 0x3FF921FB60000000, %if.end.3 ], [ 0x3FF921FB60000000, %if.end.3 ], [ 0x3FF921FB60000000, %if.end.3 ], [ %g.2.i0.2, %for.inc.2 ]
-+  br i1 false, label %cleanup, label %for.inc.3
-+
-+for.inc.3:                                        ; preds = %dx.struct_exit.new_exiting.3
-+  %cmp3.4 = fcmp fast une float %g.2.i0.3, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.4, label %dx.struct_exit.new_exiting.4, label %if.end.4, !dbg !30 ; line:19 col:9
-+
-+if.end.4:                                         ; preds = %for.inc.3
-+  switch i32 4, label %sw.epilog.4 [
-+    i32 1, label %dx.struct_exit.new_exiting.4
-+    i32 2, label %dx.struct_exit.new_exiting.4
-+    i32 3, label %dx.struct_exit.new_exiting.4
-+    i32 5, label %dx.struct_exit.new_exiting.4
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.4:                                      ; preds = %if.end.4
-+  br label %dx.struct_exit.new_exiting.4
-+
-+dx.struct_exit.new_exiting.4:                     ; preds = %sw.epilog.4, %if.end.4, %if.end.4, %if.end.4, %if.end.4, %for.inc.3
-+  %dx.struct_exit.prop.4 = phi i32 [ %do_discard.2.3, %sw.epilog.4 ], [ 0, %if.end.4 ], [ 0, %if.end.4 ], [ 0, %if.end.4 ], [ 0, %if.end.4 ], [ 0, %for.inc.3 ]
-+  %do_discard.2.4 = phi i32 [ 1, %sw.epilog.4 ], [ 1, %if.end.4 ], [ 1, %if.end.4 ], [ 1, %if.end.4 ], [ 1, %if.end.4 ], [ %do_discard.2.3, %for.inc.3 ]
-+  %g.2.i0.4 = phi float [ 0x3FF921FB60000000, %sw.epilog.4 ], [ 0x3FF921FB60000000, %if.end.4 ], [ 0x3FF921FB60000000, %if.end.4 ], [ 0x3FF921FB60000000, %if.end.4 ], [ 0x3FF921FB60000000, %if.end.4 ], [ %g.2.i0.3, %for.inc.3 ]
-+  br i1 false, label %cleanup, label %for.inc.4
-+
-+for.inc.4:                                        ; preds = %dx.struct_exit.new_exiting.4
-+  %cmp3.5 = fcmp fast une float %g.2.i0.4, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.5, label %dx.struct_exit.new_exiting.5, label %if.end.5, !dbg !30 ; line:19 col:9
-+
-+if.end.5:                                         ; preds = %for.inc.4
-+  switch i32 5, label %sw.epilog.5 [
-+    i32 1, label %dx.struct_exit.new_exiting.5
-+    i32 2, label %dx.struct_exit.new_exiting.5
-+    i32 3, label %dx.struct_exit.new_exiting.5
-+    i32 5, label %dx.struct_exit.new_exiting.5
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.5:                                      ; preds = %if.end.5
-+  br label %dx.struct_exit.new_exiting.5
-+
-+dx.struct_exit.new_exiting.5:                     ; preds = %sw.epilog.5, %if.end.5, %if.end.5, %if.end.5, %if.end.5, %for.inc.4
-+  %dx.struct_exit.prop.5 = phi i32 [ %do_discard.2.4, %sw.epilog.5 ], [ 0, %if.end.5 ], [ 0, %if.end.5 ], [ 0, %if.end.5 ], [ 0, %if.end.5 ], [ 0, %for.inc.4 ]
-+  %do_discard.2.5 = phi i32 [ 1, %sw.epilog.5 ], [ 1, %if.end.5 ], [ 1, %if.end.5 ], [ 1, %if.end.5 ], [ 1, %if.end.5 ], [ %do_discard.2.4, %for.inc.4 ]
-+  %g.2.i0.5 = phi float [ 0x3FF921FB60000000, %sw.epilog.5 ], [ 0x3FF921FB60000000, %if.end.5 ], [ 0x3FF921FB60000000, %if.end.5 ], [ 0x3FF921FB60000000, %if.end.5 ], [ 0x3FF921FB60000000, %if.end.5 ], [ %g.2.i0.4, %for.inc.4 ]
-+  br i1 false, label %cleanup, label %for.inc.5
-+
-+for.inc.5:                                        ; preds = %dx.struct_exit.new_exiting.5
-+  %cmp3.6 = fcmp fast une float %g.2.i0.5, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.6, label %dx.struct_exit.new_exiting.6, label %if.end.6, !dbg !30 ; line:19 col:9
-+
-+if.end.6:                                         ; preds = %for.inc.5
-+  switch i32 6, label %sw.epilog.6 [
-+    i32 1, label %dx.struct_exit.new_exiting.6
-+    i32 2, label %dx.struct_exit.new_exiting.6
-+    i32 3, label %dx.struct_exit.new_exiting.6
-+    i32 5, label %dx.struct_exit.new_exiting.6
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.6:                                      ; preds = %if.end.6
-+  br label %dx.struct_exit.new_exiting.6
-+
-+dx.struct_exit.new_exiting.6:                     ; preds = %sw.epilog.6, %if.end.6, %if.end.6, %if.end.6, %if.end.6, %for.inc.5
-+  %dx.struct_exit.prop23.6 = phi i1 [ true, %sw.epilog.6 ], [ false, %if.end.6 ], [ false, %if.end.6 ], [ false, %if.end.6 ], [ false, %if.end.6 ], [ false, %for.inc.5 ]
-+  %dx.struct_exit.prop.6 = phi i32 [ %do_discard.2.5, %sw.epilog.6 ], [ 0, %if.end.6 ], [ 0, %if.end.6 ], [ 0, %if.end.6 ], [ 0, %if.end.6 ], [ 0, %for.inc.5 ]
-+  %do_discard.2.6 = phi i32 [ 1, %sw.epilog.6 ], [ 1, %if.end.6 ], [ 1, %if.end.6 ], [ 1, %if.end.6 ], [ 1, %if.end.6 ], [ %do_discard.2.5, %for.inc.5 ]
-+  %g.2.i0.6 = phi float [ 0x3FF921FB60000000, %sw.epilog.6 ], [ 0x3FF921FB60000000, %if.end.6 ], [ 0x3FF921FB60000000, %if.end.6 ], [ 0x3FF921FB60000000, %if.end.6 ], [ 0x3FF921FB60000000, %if.end.6 ], [ %g.2.i0.5, %for.inc.5 ]
-+  br i1 %dx.struct_exit.prop23.6, label %cleanup, label %for.inc.6
-+
-+for.inc.6:                                        ; preds = %dx.struct_exit.new_exiting.6
-+  %cmp3.7 = fcmp fast une float %g.2.i0.6, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.7, label %dx.struct_exit.new_exiting.7, label %if.end.7, !dbg !30 ; line:19 col:9
-+
-+if.end.7:                                         ; preds = %for.inc.6
-+  switch i32 7, label %sw.epilog.7 [
-+    i32 1, label %dx.struct_exit.new_exiting.7
-+    i32 2, label %dx.struct_exit.new_exiting.7
-+    i32 3, label %dx.struct_exit.new_exiting.7
-+    i32 5, label %dx.struct_exit.new_exiting.7
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.7:                                      ; preds = %if.end.7
-+  br label %dx.struct_exit.new_exiting.7
-+
-+dx.struct_exit.new_exiting.7:                     ; preds = %sw.epilog.7, %if.end.7, %if.end.7, %if.end.7, %if.end.7, %for.inc.6
-+  %dx.struct_exit.prop.7 = phi i32 [ %do_discard.2.6, %sw.epilog.7 ], [ 0, %if.end.7 ], [ 0, %if.end.7 ], [ 0, %if.end.7 ], [ 0, %if.end.7 ], [ 0, %for.inc.6 ]
-+  %do_discard.2.7 = phi i32 [ 1, %sw.epilog.7 ], [ 1, %if.end.7 ], [ 1, %if.end.7 ], [ 1, %if.end.7 ], [ 1, %if.end.7 ], [ %do_discard.2.6, %for.inc.6 ]
-+  %g.2.i0.7 = phi float [ 0x3FF921FB60000000, %sw.epilog.7 ], [ 0x3FF921FB60000000, %if.end.7 ], [ 0x3FF921FB60000000, %if.end.7 ], [ 0x3FF921FB60000000, %if.end.7 ], [ 0x3FF921FB60000000, %if.end.7 ], [ %g.2.i0.6, %for.inc.6 ]
-+  br i1 false, label %cleanup, label %for.inc.7
-+
-+for.inc.7:                                        ; preds = %dx.struct_exit.new_exiting.7
-+  %cmp3.8 = fcmp fast une float %g.2.i0.7, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.8, label %dx.struct_exit.new_exiting.8, label %if.end.8, !dbg !30 ; line:19 col:9
-+
-+if.end.8:                                         ; preds = %for.inc.7
-+  switch i32 8, label %sw.epilog.8 [
-+    i32 1, label %dx.struct_exit.new_exiting.8
-+    i32 2, label %dx.struct_exit.new_exiting.8
-+    i32 3, label %dx.struct_exit.new_exiting.8
-+    i32 5, label %dx.struct_exit.new_exiting.8
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.8:                                      ; preds = %if.end.8
-+  br label %dx.struct_exit.new_exiting.8
-+
-+dx.struct_exit.new_exiting.8:                     ; preds = %sw.epilog.8, %if.end.8, %if.end.8, %if.end.8, %if.end.8, %for.inc.7
-+  %dx.struct_exit.prop.8 = phi i32 [ %do_discard.2.7, %sw.epilog.8 ], [ 0, %if.end.8 ], [ 0, %if.end.8 ], [ 0, %if.end.8 ], [ 0, %if.end.8 ], [ 0, %for.inc.7 ]
-+  %do_discard.2.8 = phi i32 [ 1, %sw.epilog.8 ], [ 1, %if.end.8 ], [ 1, %if.end.8 ], [ 1, %if.end.8 ], [ 1, %if.end.8 ], [ %do_discard.2.7, %for.inc.7 ]
-+  %g.2.i0.8 = phi float [ 0x3FF921FB60000000, %sw.epilog.8 ], [ 0x3FF921FB60000000, %if.end.8 ], [ 0x3FF921FB60000000, %if.end.8 ], [ 0x3FF921FB60000000, %if.end.8 ], [ 0x3FF921FB60000000, %if.end.8 ], [ %g.2.i0.7, %for.inc.7 ]
-+  br i1 false, label %cleanup, label %for.inc.8
-+
-+for.inc.8:                                        ; preds = %dx.struct_exit.new_exiting.8
-+  %cmp3.9 = fcmp fast une float %g.2.i0.8, 0.000000e+00, !dbg !29 ; line:19 col:13
-+  br i1 %cmp3.9, label %dx.struct_exit.new_exiting.9, label %if.end.9, !dbg !30 ; line:19 col:9
-+
-+if.end.9:                                         ; preds = %for.inc.8
-+  switch i32 9, label %sw.epilog.9 [
-+    i32 1, label %dx.struct_exit.new_exiting.9
-+    i32 2, label %dx.struct_exit.new_exiting.9
-+    i32 3, label %dx.struct_exit.new_exiting.9
-+    i32 5, label %dx.struct_exit.new_exiting.9
-+  ], !dbg !31 ; line:23 col:5
-+
-+sw.epilog.9:                                      ; preds = %if.end.9
-+  br label %dx.struct_exit.new_exiting.9
-+
-+dx.struct_exit.new_exiting.9:                     ; preds = %sw.epilog.9, %if.end.9, %if.end.9, %if.end.9, %if.end.9, %for.inc.8
-+  %dx.struct_exit.prop.9 = phi i32 [ %do_discard.2.8, %sw.epilog.9 ], [ 0, %if.end.9 ], [ 0, %if.end.9 ], [ 0, %if.end.9 ], [ 0, %if.end.9 ], [ 0, %for.inc.8 ]
-+  %do_discard.2.9 = phi i32 [ 1, %sw.epilog.9 ], [ 1, %if.end.9 ], [ 1, %if.end.9 ], [ 1, %if.end.9 ], [ 1, %if.end.9 ], [ %do_discard.2.8, %for.inc.8 ]
-+  br i1 false, label %cleanup, label %for.inc.9
-+
-+for.inc.9:                                        ; preds = %dx.struct_exit.new_exiting.9
-+  br label %cleanup
-+}
-+
-+; Function Attrs: nounwind
-+declare void @dx.op.storeOutput.f32(i32, i32, i32, i8, float) #0
-+
-+; Function Attrs: nounwind
-+declare void @dx.op.discard(i32, i1) #0
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.ResRet.i32 @dx.op.rawBufferLoad.i32(i32, %dx.types.Handle, i32, i32, i8, i32) #1
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.Handle @dx.op.createHandleForLib.struct.ByteAddressBuffer(i32, %struct.ByteAddressBuffer) #1
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @dx.op.annotateHandle(i32, %dx.types.Handle, %dx.types.ResourceProperties) #2
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readonly }
-+attributes #2 = { nounwind readnone }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.resources = !{!6}
-+!dx.typeAnnotations = !{!9, !12}
-+!dx.entryPoints = !{!19}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-+!2 = !{!"dxc(private) 1.8.0.4514 (d9bd2a706-dirty)"}
-+!3 = !{i32 1, i32 6}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"ps", i32 6, i32 6}
-+!6 = !{!7, null, null, null}
-+!7 = !{!8}
-+!8 = !{i32 0, %struct.ByteAddressBuffer* @"\01?g_buff@@3UByteAddressBuffer@@A", !"g_buff", i32 0, i32 0, i32 1, i32 11, i32 0, null}
-+!9 = !{i32 0, %struct.retval undef, !10}
-+!10 = !{i32 16, !11}
-+!11 = !{i32 6, !"value", i32 3, i32 0, i32 4, !"SV_Target0", i32 7, i32 9}
-+!12 = !{i32 1, void (<4 x float>*)* @main, !13}
-+!13 = !{!14, !16}
-+!14 = !{i32 0, !15, !15}
-+!15 = !{}
-+!16 = !{i32 1, !17, !18}
-+!17 = !{i32 4, !"SV_Target0", i32 7, i32 9}
-+!18 = !{i32 0}
-+!19 = !{void (<4 x float>*)* @main, !"main", !20, !6, null}
-+!20 = !{null, !21, null}
-+!21 = !{!22}
-+!22 = !{i32 0, !"SV_Target", i8 9, i8 16, !18, i8 0, i32 1, i8 4, i32 0, i8 0, null}
-+!23 = !DILocation(line: 15, column: 22, scope: !24)
-+!24 = !DISubprogram(name: "main", scope: !25, file: !25, line: 14, type: !26, isLocal: false, isDefinition: true, scopeLine: 14, flags: DIFlagPrototyped, isOptimized: false, function: void (<4 x float>*)* @main)
-+!25 = !DIFile(filename: "/home/amaiorano/src/external/DirectXShaderCompiler/tools/clang/test/DXC/Passes/DxilRemoveDeadBlocks/switch-with-multiple-same-successor.hlsl", directory: "")
-+!26 = !DISubroutineType(types: !15)
-+!27 = !DILocation(line: 15, column: 14, scope: !24)
-+!28 = !DILocation(line: 18, column: 3, scope: !24)
-+!29 = !DILocation(line: 19, column: 13, scope: !24)
-+!30 = !DILocation(line: 19, column: 9, scope: !24)
-+!31 = !DILocation(line: 23, column: 5, scope: !24)
-+!32 = !DILocation(line: 49, column: 7, scope: !24)
-+!33 = !DILocation(line: 49, column: 19, scope: !24)
-+!34 = !DILocation(line: 51, column: 3, scope: !24)
-+!35 = !DILocation(line: 53, column: 18, scope: !24)
-+!36 = !DILocation(line: 54, column: 1, scope: !24)

patches/DirectXShaderCompiler/cherry-pick-2a434fd0af6b.patch

@@ -1,419 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Wed, 8 May 2024 13:38:38 -0400
-Subject: Fix invalid IR from scalarrepl-param-hlsl in ReplaceConstantWithInst
- (#6556)
-
-ReplaceConstantWithInst(C, V) replaces uses of C in the current function
-with V. If such a use C is an instruction I, the it replaces uses of C
-in I with V. However, this function did not make sure to only perform
-this replacement if V dominates I. As a result, it may end up replacing
-uses of C in instructions before the definition of V.
-
-The fix is to lazily compute the dominator tree in
-ReplaceConstantWithInst so that we can guard the replacement with that
-dominance check.
-
-Bug: chromium:333414294
-Change-Id: I2a8bf64094298b49a1887cc7c1334e91a745c396
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5525429
-Reviewed-by: James Price <jrprice@google.com>
-Reviewed-by: dan sinclair <dsinclair@google.com>
-
-diff --git a/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp b/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-index 3f8ffdbcfa09a96899295fd85291cedb879a248b..9b843ef0e49e554001b827e30eb6256853d90f5b 100644
---- a/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-+++ b/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-@@ -3271,15 +3271,34 @@ bool SROA_Helper::DoScalarReplacement(GlobalVariable *GV,
-   return true;
- }
- 
--static void ReplaceConstantWithInst(Constant *C, Value *V,
-+// Replaces uses of constant C in the current function
-+// with V, when those uses are dominated by V.
-+// Returns true if it was completely replaced.
-+static bool ReplaceConstantWithInst(Constant *C, Value *V,
-                                     IRBuilder<> &Builder) {
-+  bool bReplacedAll = true;
-   Function *F = Builder.GetInsertBlock()->getParent();
-+  Instruction *VInst = dyn_cast<Instruction>(V);
-+  // Lazily calculate dominance
-+  DominatorTree DT;
-+  bool Calculated = false;
-+  auto Dominates = [&](llvm::Instruction *Def, llvm::Instruction *User) {
-+    if (!Calculated) {
-+      DT.recalculate(*F);
-+      Calculated = true;
-+    }
-+    return DT.dominates(Def, User);
-+  };
-+
-   for (auto it = C->user_begin(); it != C->user_end();) {
-     User *U = *(it++);
-     if (Instruction *I = dyn_cast<Instruction>(U)) {
-       if (I->getParent()->getParent() != F)
-         continue;
--      I->replaceUsesOfWith(C, V);
-+      if (VInst && Dominates(VInst, I))
-+        I->replaceUsesOfWith(C, V);
-+      else
-+        bReplacedAll = false;
-     } else {
-       // Skip unused ConstantExpr.
-       if (U->user_empty())
-@@ -3288,10 +3307,12 @@ static void ReplaceConstantWithInst(Constant *C, Value *V,
-       Instruction *Inst = CE->getAsInstruction();
-       Builder.Insert(Inst);
-       Inst->replaceUsesOfWith(C, V);
--      ReplaceConstantWithInst(CE, Inst, Builder);
-+      if (!ReplaceConstantWithInst(CE, Inst, Builder))
-+        bReplacedAll = false;
-     }
-   }
-   C->removeDeadConstantUsers();
-+  return bReplacedAll;
- }
- 
- static void ReplaceUnboundedArrayUses(Value *V, Value *Src) {
-@@ -3531,7 +3552,8 @@ static bool ReplaceMemcpy(Value *V, Value *Src, MemCpyInst *MC,
-       } else {
-         // Replace Constant with a non-Constant.
-         IRBuilder<> Builder(MC);
--        ReplaceConstantWithInst(C, Src, Builder);
-+        if (!ReplaceConstantWithInst(C, Src, Builder))
-+          return false;
-       }
-     } else {
-       // Try convert special pattern for cbuffer which copy array of float4 to
-@@ -3539,7 +3561,8 @@ static bool ReplaceMemcpy(Value *V, Value *Src, MemCpyInst *MC,
-       if (!tryToReplaceCBVec4ArrayToScalarArray(V, TyV, Src, TySrc, MC, DL)) {
-         IRBuilder<> Builder(MC);
-         Src = Builder.CreateBitCast(Src, V->getType());
--        ReplaceConstantWithInst(C, Src, Builder);
-+        if (!ReplaceConstantWithInst(C, Src, Builder))
-+          return false;
-       }
-     }
-   } else {
-@@ -5447,9 +5470,9 @@ void SROA_Parameter_HLSL::flattenArgument(
-         if (Ty->isPointerTy())
-           Ty = Ty->getPointerElementType();
-         unsigned size = DL.getTypeAllocSize(Ty);
--#if 0  // HLSL Change
-+#if 0 // HLSL Change
-         DIExpression *DDIExp = DIB.createBitPieceExpression(debugOffset, size);
--#else  // HLSL Change
-+#else // HLSL Change
-         Type *argTy = Arg->getType();
-         if (argTy->isPointerTy())
-           argTy = argTy->getPointerElementType();
-diff --git a/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-const-to-local-and-back.hlsl b/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-const-to-local-and-back.hlsl
-new file mode 100644
-index 0000000000000000000000000000000000000000..0f30050e69decaf7da3f2ae645611c1a49a4a719
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-const-to-local-and-back.hlsl
-@@ -0,0 +1,45 @@
-+// RUN: not %dxc -T ps_6_2 %s 2>&1 | FileCheck %s
-+
-+// Validate that copying from static array to local, then back to static
-+// array does not crash the compiler. This was resulting in an invalid
-+// ReplaceConstantWithInst from ScalarReplAggregatesHLSL, which would
-+// result in referenced deleted instruction in a later pass.
-+
-+// CHECK: error: Loop must have break.
-+
-+static int arr1[10] = (int[10])0;
-+static int arr2[10] = (int[10])0;
-+static float result = 0;
-+ByteAddressBuffer buff : register(t0);
-+
-+void foo() {
-+  int i = 0;
-+  if (buff.Load(0u)) {
-+    return;
-+  }
-+  arr2[i] = arr1[i];
-+  result = float(arr1[0]);
-+}
-+
-+struct tint_symbol {
-+  float4 value : SV_Target0;
-+};
-+
-+float main_inner() {
-+  foo();
-+  bool cond = false;
-+  while (true) {
-+    if (cond) { break; }
-+  }
-+  int arr1_copy[10] = arr1; // constant to local
-+  arr1 = arr1_copy; // local to constant
-+  foo();
-+  return result;
-+}
-+
-+tint_symbol main() {
-+  float inner_result = main_inner();
-+  tint_symbol wrapper_result = (tint_symbol)0;
-+  wrapper_result.value.x = inner_result;
-+  return wrapper_result;
-+}
-diff --git a/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-const-to-local-and-back.ll b/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-const-to-local-and-back.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..6ca08ab3a9c500cacb715f63ee407c7add4fc51c
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-const-to-local-and-back.ll
-@@ -0,0 +1,253 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -scalarrepl-param-hlsl -S | FileCheck %s
-+
-+; The first memcpy, from arr1 to arr1_copy.i, should be replaced by a series of 10 loads and stores,
-+; while the second memcpy, from arr1_copy.i back to arr1, should be removed:
-+;   %19 = bitcast [10 x i32]* %arr1_copy.i to i8*, !dbg !33 ; line:25 col:23
-+;   call void @llvm.memcpy.p0i8.p0i8.i64(i8* %19, i8* bitcast ([10 x i32]* @arr1 to i8*), i64 40, i32 1, i1 false) #0, !dbg !33 ; line:25 col:23
-+;   %20 = bitcast [10 x i32]* %arr1_copy.i to i8*, !dbg !34 ; line:26 col:10
-+;   call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast ([10 x i32]* @arr1 to i8*), i8* %20, i64 40, i32 1, i1 false) #0, !dbg !34 ; line:26 col:10
-+;   store i32 0, i32* %i.i.1.i, align 4, !dbg !35, !tbaa !12 ; line:7 col:7
-+
-+; CHECK:  [[DEST0:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 0
-+; CHECK-NEXT:  [[SRC0:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 0)
-+; CHECK-NEXT:  store i32 [[SRC0:%[a-z0-9\.]+]], i32* [[DEST0:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST1:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 1
-+; CHECK-NEXT:  [[SRC1:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 1)
-+; CHECK-NEXT:  store i32 [[SRC1:%[a-z0-9\.]+]], i32* [[DEST1:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST2:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 2
-+; CHECK-NEXT:  [[SRC2:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 2)
-+; CHECK-NEXT:  store i32 [[SRC2:%[a-z0-9\.]+]], i32* [[DEST2:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST3:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 3
-+; CHECK-NEXT:  [[SRC3:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 3)
-+; CHECK-NEXT:  store i32 [[SRC3:%[a-z0-9\.]+]], i32* [[DEST3:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST4:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 4
-+; CHECK-NEXT:  [[SRC4:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 4)
-+; CHECK-NEXT:  store i32 [[SRC4:%[a-z0-9\.]+]], i32* [[DEST4:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST5:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 5
-+; CHECK-NEXT:  [[SRC5:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 5)
-+; CHECK-NEXT:  store i32 [[SRC5:%[a-z0-9\.]+]], i32* [[DEST5:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST6:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 6
-+; CHECK-NEXT:  [[SRC6:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 6)
-+; CHECK-NEXT:  store i32 [[SRC6:%[a-z0-9\.]+]], i32* [[DEST6:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST7:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 7
-+; CHECK-NEXT:  [[SRC7:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 7)
-+; CHECK-NEXT:  store i32 [[SRC7:%[a-z0-9\.]+]], i32* [[DEST7:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST8:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 8
-+; CHECK-NEXT:  [[SRC8:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 8)
-+; CHECK-NEXT:  store i32 [[SRC8:%[a-z0-9\.]+]], i32* [[DEST8:%[a-z0-9\.]+]]
-+; CHECK-NEXT:  [[DEST9:%[a-z0-9\.]+]] = getelementptr inbounds [10 x i32], [10 x i32]* %arr1_copy.i, i32 0, i32 9
-+; CHECK-NEXT:  [[SRC9:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 9)
-+; CHECK-NEXT:  store i32 [[SRC9:%[a-z0-9\.]+]], i32* [[DEST9:%[a-z0-9\.]+]]
-+
-+;
-+; Buffer Definitions:
-+;
-+; cbuffer $Globals
-+; {
-+;
-+;   [0 x i8] (type annotation not present)
-+;
-+; }
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; $Globals                          cbuffer      NA          NA     CB0   cb4294967295     1
-+; buff                              texture    byte         r/o      T0             t0     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%struct.ByteAddressBuffer = type { i32 }
-+%ConstantBuffer = type opaque
-+%struct.tint_symbol = type { <4 x float> }
-+%dx.types.Handle = type { i8* }
-+%dx.types.ResourceProperties = type { i32, i32 }
-+
-+@"\01?buff@@3UByteAddressBuffer@@A" = external global %struct.ByteAddressBuffer, align 4
-+@arr1 = internal global [10 x i32] zeroinitializer, align 4
-+@arr2 = internal global [10 x i32] zeroinitializer, align 4
-+@"$Globals" = external constant %ConstantBuffer
-+
-+; Function Attrs: nounwind
-+define void @main(%struct.tint_symbol* noalias sret %agg.result) #0 {
-+  %1 = alloca float
-+  store float 0.000000e+00, float* %1
-+  %i.i.1.i = alloca i32, align 4
-+  %i.i.i = alloca i32, align 4
-+  %cond.i = alloca i32, align 4
-+  %arr1_copy.i = alloca [10 x i32], align 4
-+  %inner_result = alloca float, align 4
-+  %wrapper_result = alloca %struct.tint_symbol, align 4
-+  store i32 0, i32* %i.i.i, align 4, !dbg !23, !tbaa !31 ; line:7 col:7
-+  %2 = load %struct.ByteAddressBuffer, %struct.ByteAddressBuffer* @"\01?buff@@3UByteAddressBuffer@@A", !dbg !35 ; line:8 col:7
-+  %3 = call %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %struct.ByteAddressBuffer)"(i32 0, %struct.ByteAddressBuffer %2) #0, !dbg !35 ; line:8 col:7
-+  %4 = call %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer)"(i32 14, %dx.types.Handle %3, %dx.types.ResourceProperties { i32 11, i32 0 }, %struct.ByteAddressBuffer undef) #0, !dbg !35 ; line:8 col:7
-+  %5 = call i32 @"dx.hl.op.ro.i32 (i32, %dx.types.Handle, i32)"(i32 231, %dx.types.Handle %4, i32 0) #0, !dbg !35 ; line:8 col:7
-+  %6 = icmp ne i32 %5, 0, !dbg !35 ; line:8 col:7
-+  br i1 %6, label %"\01?foo@@YAXXZ.exit.i", label %7, !dbg !35 ; line:8 col:7
-+
-+; <label>:7                                       ; preds = %0
-+  %8 = load i32, i32* %i.i.i, align 4, !dbg !36, !tbaa !31 ; line:11 col:18
-+  %9 = getelementptr inbounds [10 x i32], [10 x i32]* @arr1, i32 0, i32 %8, !dbg !37 ; line:11 col:13
-+  %10 = load i32, i32* %9, align 4, !dbg !37, !tbaa !31 ; line:11 col:13
-+  %11 = load i32, i32* %i.i.i, align 4, !dbg !38, !tbaa !31 ; line:11 col:8
-+  %12 = getelementptr inbounds [10 x i32], [10 x i32]* @arr2, i32 0, i32 %11, !dbg !39 ; line:11 col:3
-+  store i32 %10, i32* %12, align 4, !dbg !40, !tbaa !31 ; line:11 col:11
-+  %13 = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 0), align 4, !dbg !41, !tbaa !31 ; line:12 col:18
-+  %14 = sitofp i32 %13 to float, !dbg !41 ; line:12 col:18
-+  store float %14, float* %1, align 4, !dbg !42, !tbaa !43 ; line:12 col:10
-+  br label %"\01?foo@@YAXXZ.exit.i", !dbg !45 ; line:13 col:1
-+
-+"\01?foo@@YAXXZ.exit.i":                          ; preds = %7, %0
-+  store i32 0, i32* %cond.i, align 4, !dbg !46, !tbaa !47 ; line:21 col:8
-+  br label %15, !dbg !49 ; line:22 col:3
-+
-+; <label>:15                                      ; preds = %15, %"\01?foo@@YAXXZ.exit.i"
-+  %16 = load i32, i32* %cond.i, align 4, !dbg !50, !tbaa !47, !range !51 ; line:23 col:9
-+  %17 = icmp ne i32 %16, 0, !dbg !50 ; line:23 col:9
-+  br i1 %17, label %18, label %15, !dbg !50 ; line:23 col:9
-+
-+; <label>:18                                      ; preds = %15
-+  %19 = bitcast [10 x i32]* %arr1_copy.i to i8*, !dbg !52 ; line:25 col:23
-+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %19, i8* bitcast ([10 x i32]* @arr1 to i8*), i64 40, i32 1, i1 false) #0, !dbg !52 ; line:25 col:23
-+  %20 = bitcast [10 x i32]* %arr1_copy.i to i8*, !dbg !53 ; line:26 col:10
-+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast ([10 x i32]* @arr1 to i8*), i8* %20, i64 40, i32 1, i1 false) #0, !dbg !53 ; line:26 col:10
-+  store i32 0, i32* %i.i.1.i, align 4, !dbg !54, !tbaa !31 ; line:7 col:7
-+  %21 = load %struct.ByteAddressBuffer, %struct.ByteAddressBuffer* @"\01?buff@@3UByteAddressBuffer@@A", !dbg !56 ; line:8 col:7
-+  %22 = call %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %struct.ByteAddressBuffer)"(i32 0, %struct.ByteAddressBuffer %21) #0, !dbg !56 ; line:8 col:7
-+  %23 = call %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer)"(i32 14, %dx.types.Handle %22, %dx.types.ResourceProperties { i32 11, i32 0 }, %struct.ByteAddressBuffer undef) #0, !dbg !56 ; line:8 col:7
-+  %24 = call i32 @"dx.hl.op.ro.i32 (i32, %dx.types.Handle, i32)"(i32 231, %dx.types.Handle %23, i32 0) #0, !dbg !56 ; line:8 col:7
-+  %25 = icmp ne i32 %24, 0, !dbg !56 ; line:8 col:7
-+  br i1 %25, label %"\01?main_inner@@YAMXZ.exit", label %26, !dbg !56 ; line:8 col:7
-+
-+; <label>:26                                      ; preds = %18
-+  %27 = load i32, i32* %i.i.1.i, align 4, !dbg !57, !tbaa !31 ; line:11 col:18
-+  %28 = getelementptr inbounds [10 x i32], [10 x i32]* @arr1, i32 0, i32 %27, !dbg !58 ; line:11 col:13
-+  %29 = load i32, i32* %28, align 4, !dbg !58, !tbaa !31 ; line:11 col:13
-+  %30 = load i32, i32* %i.i.1.i, align 4, !dbg !59, !tbaa !31 ; line:11 col:8
-+  %31 = getelementptr inbounds [10 x i32], [10 x i32]* @arr2, i32 0, i32 %30, !dbg !60 ; line:11 col:3
-+  store i32 %29, i32* %31, align 4, !dbg !61, !tbaa !31 ; line:11 col:11
-+  %32 = load i32, i32* getelementptr inbounds ([10 x i32], [10 x i32]* @arr1, i32 0, i32 0), align 4, !dbg !62, !tbaa !31 ; line:12 col:18
-+  %33 = sitofp i32 %32 to float, !dbg !62 ; line:12 col:18
-+  store float %33, float* %1, align 4, !dbg !63, !tbaa !43 ; line:12 col:10
-+  br label %"\01?main_inner@@YAMXZ.exit", !dbg !64 ; line:13 col:1
-+
-+"\01?main_inner@@YAMXZ.exit":                     ; preds = %18, %26
-+  %34 = load float, float* %1, align 4, !dbg !65, !tbaa !43 ; line:28 col:10
-+  store float %34, float* %inner_result, align 4, !dbg !66, !tbaa !43 ; line:32 col:9
-+  %35 = getelementptr inbounds %struct.tint_symbol, %struct.tint_symbol* %wrapper_result, i32 0, i32 0, !dbg !67 ; line:33 col:45
-+  store <4 x float> zeroinitializer, <4 x float>* %35, !dbg !67 ; line:33 col:45
-+  %36 = load float, float* %inner_result, align 4, !dbg !68, !tbaa !43 ; line:34 col:28
-+  %37 = getelementptr inbounds %struct.tint_symbol, %struct.tint_symbol* %wrapper_result, i32 0, i32 0, !dbg !69 ; line:34 col:18
-+  %38 = load <4 x float>, <4 x float>* %37, align 4, !dbg !70 ; line:34 col:26
-+  %39 = getelementptr <4 x float>, <4 x float>* %37, i32 0, i32 0, !dbg !70 ; line:34 col:26
-+  store float %36, float* %39, !dbg !70 ; line:34 col:26
-+  %40 = bitcast %struct.tint_symbol* %agg.result to i8*, !dbg !71 ; line:35 col:10
-+  %41 = bitcast %struct.tint_symbol* %wrapper_result to i8*, !dbg !71 ; line:35 col:10
-+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %40, i8* %41, i64 16, i32 1, i1 false), !dbg !71 ; line:35 col:10
-+  ret void, !dbg !72 ; line:35 col:3
-+}
-+
-+; Function Attrs: nounwind
-+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #0
-+
-+; Function Attrs: nounwind readonly
-+declare i32 @"dx.hl.op.ro.i32 (i32, %dx.types.Handle, i32)"(i32, %dx.types.Handle, i32) #1
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %struct.ByteAddressBuffer)"(i32, %struct.ByteAddressBuffer) #2
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer)"(i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer) #2
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readonly }
-+attributes #2 = { nounwind readnone }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.typeAnnotations = !{!6, !9}
-+!dx.entryPoints = !{!14}
-+!dx.fnprops = !{!20}
-+!dx.options = !{!21, !22}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-hlemit", !"hlsl-hlensure"}
-+!2 = !{!"dxc(private) 1.8.0.4547 (14ec4b49d)"}
-+!3 = !{i32 1, i32 2}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"ps", i32 6, i32 2}
-+!6 = !{i32 0, %struct.tint_symbol undef, !7}
-+!7 = !{i32 16, !8}
-+!8 = !{i32 6, !"value", i32 3, i32 0, i32 4, !"SV_Target0", i32 7, i32 9}
-+!9 = !{i32 1, void (%struct.tint_symbol*)* @main, !10}
-+!10 = !{!11, !13}
-+!11 = !{i32 0, !12, !12}
-+!12 = !{}
-+!13 = !{i32 1, !12, !12}
-+!14 = !{void (%struct.tint_symbol*)* @main, !"main", null, !15, null}
-+!15 = !{!16, null, !18, null}
-+!16 = !{!17}
-+!17 = !{i32 0, %struct.ByteAddressBuffer* @"\01?buff@@3UByteAddressBuffer@@A", !"buff", i32 0, i32 0, i32 1, i32 11, i32 0, null}
-+!18 = !{!19}
-+!19 = !{i32 0, %ConstantBuffer* @"$Globals", !"$Globals", i32 0, i32 -1, i32 1, i32 0, null}
-+!20 = !{void (%struct.tint_symbol*)* @main, i32 0, i1 false}
-+!21 = !{i32 144}
-+!22 = !{i32 -1}
-+!23 = !DILocation(line: 7, column: 7, scope: !24, inlinedAt: !27)
-+!24 = !DISubprogram(name: "foo", scope: !25, file: !25, line: 6, type: !26, isLocal: false, isDefinition: true, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: false)
-+!25 = !DIFile(filename: "333414294_simplifed.hlsl", directory: "")
-+!26 = !DISubroutineType(types: !12)
-+!27 = distinct !DILocation(line: 20, column: 3, scope: !28, inlinedAt: !29)
-+!28 = !DISubprogram(name: "main_inner", scope: !25, file: !25, line: 19, type: !26, isLocal: false, isDefinition: true, scopeLine: 19, flags: DIFlagPrototyped, isOptimized: false)
-+!29 = distinct !DILocation(line: 32, column: 24, scope: !30)
-+!30 = !DISubprogram(name: "main", scope: !25, file: !25, line: 31, type: !26, isLocal: false, isDefinition: true, scopeLine: 31, flags: DIFlagPrototyped, isOptimized: false, function: void (%struct.tint_symbol*)* @main)
-+!31 = !{!32, !32, i64 0}
-+!32 = !{!"int", !33, i64 0}
-+!33 = !{!"omnipotent char", !34, i64 0}
-+!34 = !{!"Simple C/C++ TBAA"}
-+!35 = !DILocation(line: 8, column: 7, scope: !24, inlinedAt: !27)
-+!36 = !DILocation(line: 11, column: 18, scope: !24, inlinedAt: !27)
-+!37 = !DILocation(line: 11, column: 13, scope: !24, inlinedAt: !27)
-+!38 = !DILocation(line: 11, column: 8, scope: !24, inlinedAt: !27)
-+!39 = !DILocation(line: 11, column: 3, scope: !24, inlinedAt: !27)
-+!40 = !DILocation(line: 11, column: 11, scope: !24, inlinedAt: !27)
-+!41 = !DILocation(line: 12, column: 18, scope: !24, inlinedAt: !27)
-+!42 = !DILocation(line: 12, column: 10, scope: !24, inlinedAt: !27)
-+!43 = !{!44, !44, i64 0}
-+!44 = !{!"float", !33, i64 0}
-+!45 = !DILocation(line: 13, column: 1, scope: !24, inlinedAt: !27)
-+!46 = !DILocation(line: 21, column: 8, scope: !28, inlinedAt: !29)
-+!47 = !{!48, !48, i64 0}
-+!48 = !{!"bool", !33, i64 0}
-+!49 = !DILocation(line: 22, column: 3, scope: !28, inlinedAt: !29)
-+!50 = !DILocation(line: 23, column: 9, scope: !28, inlinedAt: !29)
-+!51 = !{i32 0, i32 2}
-+!52 = !DILocation(line: 25, column: 23, scope: !28, inlinedAt: !29)
-+!53 = !DILocation(line: 26, column: 10, scope: !28, inlinedAt: !29)
-+!54 = !DILocation(line: 7, column: 7, scope: !24, inlinedAt: !55)
-+!55 = distinct !DILocation(line: 27, column: 3, scope: !28, inlinedAt: !29)
-+!56 = !DILocation(line: 8, column: 7, scope: !24, inlinedAt: !55)
-+!57 = !DILocation(line: 11, column: 18, scope: !24, inlinedAt: !55)
-+!58 = !DILocation(line: 11, column: 13, scope: !24, inlinedAt: !55)
-+!59 = !DILocation(line: 11, column: 8, scope: !24, inlinedAt: !55)
-+!60 = !DILocation(line: 11, column: 3, scope: !24, inlinedAt: !55)
-+!61 = !DILocation(line: 11, column: 11, scope: !24, inlinedAt: !55)
-+!62 = !DILocation(line: 12, column: 18, scope: !24, inlinedAt: !55)
-+!63 = !DILocation(line: 12, column: 10, scope: !24, inlinedAt: !55)
-+!64 = !DILocation(line: 13, column: 1, scope: !24, inlinedAt: !55)
-+!65 = !DILocation(line: 28, column: 10, scope: !28, inlinedAt: !29)
-+!66 = !DILocation(line: 32, column: 9, scope: !30)
-+!67 = !DILocation(line: 33, column: 45, scope: !30)
-+!68 = !DILocation(line: 34, column: 28, scope: !30)
-+!69 = !DILocation(line: 34, column: 18, scope: !30)
-+!70 = !DILocation(line: 34, column: 26, scope: !30)
-+!71 = !DILocation(line: 35, column: 10, scope: !30)
-+!72 = !DILocation(line: 35, column: 3, scope: !30)

patches/DirectXShaderCompiler/cherry-pick-33051b084850.patch

@@ -1,332 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Mon, 10 Jun 2024 10:52:30 -0400
-Subject: Loop exit restructurizer: don't iterate over uses while mutating them
- (#6644)
-
-The SkipBlockWithBranch function does the following:
-- Splits the block into three blocks with an if-then-endif structure.
-- Moves most instructions from the original block into the "then" block
-- If any of those values are used outside the original block, they are
-propagated through newly-constructed phis in the 'endif' block.
-
-This algorithm had a bug where the uses of a value were being scanned
-while the uses were also being updated. In some cases a downstream
-out-of-block use could be skipped. That results in an invalid module
-because now the original definition is now in the 'then' block, which
-does not dominate the downstream out-of-block use.
-
-Add a test that demonstrates the problem.
-
-Bug: chromium:339171223
-Change-Id: Ia34fd7a2fe84de635289f7499772d11866a28e24
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5615350
-Reviewed-by: James Price <jrprice@google.com>
-Reviewed-by: dan sinclair <dsinclair@google.com>
-
-diff --git a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
-index ef6718f0f22ee33e3f16f9801a64c1a6fb6c653a..70e6ccd8ddbaeabdb469710ad8529933f0286abd 100644
---- a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
-+++ b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
-@@ -322,24 +322,26 @@ static void SkipBlockWithBranch(BasicBlock *bb, Value *cond, Loop *L,
-   BranchInst::Create(end, body, cond, bb);
- 
-   for (Instruction &inst : *body) {
--    PHINode *phi = nullptr;
- 
-     // For each user that's outside of 'body', replace its use of 'inst' with a
-     // phi created in 'end'
--    for (auto it = inst.user_begin(); it != inst.user_end();) {
--      Instruction *user_inst = cast<Instruction>(*(it++));
--      if (user_inst == phi)
--        continue;
-+    SmallPtrSet<Instruction *, 8> users_in_other_blocks;
-+    for (auto *user : inst.users()) {
-+      Instruction *user_inst = cast<Instruction>(user);
-       if (user_inst->getParent() != body) {
--        if (!phi) {
--          phi = PHINode::Create(inst.getType(), 2, "", &*end->begin());
--          phi->addIncoming(GetDefaultValue(inst.getType()), bb);
--          phi->addIncoming(&inst, body);
--        }
-+        users_in_other_blocks.insert(user_inst);
-+      }
-+    }
-+    if (users_in_other_blocks.size() > 0) {
-+      auto *phi = PHINode::Create(inst.getType(), 2, "", &*end->begin());
-+      phi->addIncoming(GetDefaultValue(inst.getType()), bb);
-+      phi->addIncoming(&inst, body);
-+
-+      for (auto *user_inst : users_in_other_blocks) {
-         user_inst->replaceUsesOfWith(&inst, phi);
-       }
--    } // For each user of inst of body
--  }   // For each inst in body
-+    }
-+  } // For each inst in body
- 
-   L->addBasicBlockToLoop(body, *LI);
-   L->addBasicBlockToLoop(end, *LI);
-diff --git a/tools/clang/test/DXC/Passes/DxilRemoveUnstructuredLoopExits/struct_exit_wrap_value_iteration_bug.ll b/tools/clang/test/DXC/Passes/DxilRemoveUnstructuredLoopExits/struct_exit_wrap_value_iteration_bug.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..ee912c929bdc0424959a29d16c3d5c64f885f809
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/DxilRemoveUnstructuredLoopExits/struct_exit_wrap_value_iteration_bug.ll
-@@ -0,0 +1,257 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -loop-unroll,StructurizeLoopExits=1 -S | FileCheck %s
-+
-+; The Loop exit structurizer will wrap the definition of %DerivFineX3 in a conditional block.
-+; Its value will later be propagated into a phi, and that phi replaces all further uses
-+; of %DerivFineX3.
-+;
-+; Tests that a bug is fixed where the code used to iterate through the uses of a value
-+; while also updating those uses.  The old code would fail to update the definition
-+; of %g.i.2.i3 and the result would be an invalid module: %DerivFineX3 would not dominate
-+; all its uses.
-+
-+
-+; CHECK: define void @main
-+; CHECK-NOT:  %DerivFineX3
-+; CHECK:  "\01?f@@YAXXZ.exit.i":
-+; CHECK-NEXT:  br i1 true, label %dx.struct_exit.cond_end, label %dx.struct_exit.cond_body
-+
-+; CHECK: dx.struct_exit.cond_body:
-+; CHECK:  %DerivFineX3 = call
-+; CHECK:  br label %dx.struct_exit.cond_end
-+
-+; CHECK: dx.struct_exit.cond_end:
-+; CHECK:  = phi {{.*}} %DerivFineX3
-+; CHECK:  br
-+; CHECK-NOT:  %DerivFineX3
-+; CHECK: ret void
-+
-+
-+;
-+;
-+; void f() {
-+;   int l_1 = 10;
-+;   for (int l = 0, l_2 = 0; l < 5 && l_2 < 1; l++, l_2++) {
-+;     while (1 < l_1) { }
-+;   }
-+; }
-+;
-+;
-+; struct tint_symbol {
-+;   float4 value : SV_Target0;
-+; };
-+;
-+; float4 main_inner() {
-+;   float4 g = float4(0.0f, 0.0f, 0.0f, 0.0f);
-+;   bool2 true2 = (true).xx;
-+;   uint2 _e8 = (0u).xx;
-+;   do {
-+;     if (_e8.x != 2u) {
-+;       f();
-+;       float4 _e15 = ddx_fine(g);
-+;       if (_e8[_e8.x] == 2u) {
-+;         g = _e15;
-+;       } else {
-+;         f();
-+;       }
-+;       switch(_e8.x) {
-+;         case 3u: {
-+;           break;
-+;         }
-+;         case 2u: {
-+;           g = _e15;
-+;           break;
-+;         }
-+;         default: {
-+;           g = _e15;
-+;         }
-+;       }
-+;       f();
-+;     }
-+;  } while(!all(true2));
-+;   return g;
-+;}
-+;
-+;tint_symbol main() {
-+;  float4 inner_result = main_inner();
-+;  tint_symbol wrapper_result = (tint_symbol)0;
-+;  wrapper_result.value = inner_result;
-+;  return wrapper_result;
-+;}
-+
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%struct.tint_symbol = type { <4 x float> }
-+
-+; Function Attrs: nounwind
-+define void @main(<4 x float>* noalias) #0 {
-+entry:
-+  %1 = alloca [2 x i32], align 4
-+  %2 = getelementptr inbounds [2 x i32], [2 x i32]* %1, i32 0, i32 0, !dbg !20 ; line:17 col:9
-+  store i32 0, i32* %2, align 4, !dbg !20 ; line:17 col:9
-+  %3 = getelementptr inbounds [2 x i32], [2 x i32]* %1, i32 0, i32 1, !dbg !20 ; line:17 col:9
-+  store i32 0, i32* %3, align 4, !dbg !20 ; line:17 col:9
-+  br label %do.body.i, !dbg !26 ; line:18 col:3
-+
-+do.body.i:                                        ; preds = %do.cond.i, %entry
-+  %g.i.0.i0 = phi float [ 0.000000e+00, %entry ], [ %g.i.3.i0, %do.cond.i ]
-+  %g.i.0.i1 = phi float [ 0.000000e+00, %entry ], [ %g.i.3.i1, %do.cond.i ]
-+  %g.i.0.i2 = phi float [ 0.000000e+00, %entry ], [ %g.i.3.i2, %do.cond.i ]
-+  %g.i.0.i3 = phi float [ 0.000000e+00, %entry ], [ %g.i.3.i3, %do.cond.i ]
-+  %4 = getelementptr inbounds [2 x i32], [2 x i32]* %1, i32 0, i32 0, !dbg !27 ; line:19 col:9
-+  %5 = load i32, i32* %4, align 4, !dbg !27 ; line:19 col:9
-+  %cmp.i = icmp ne i32 %5, 2, !dbg !28 ; line:19 col:15
-+  br i1 %cmp.i, label %for.cond.i.i, label %do.cond.i, !dbg !27 ; line:19 col:9
-+
-+for.cond.i.i:                                     ; preds = %do.body.i
-+  br i1 true, label %while.cond.i.i.preheader, label %"\01?f@@YAXXZ.exit.i", !dbg !29 ; line:4 col:3
-+
-+while.cond.i.i.preheader:                         ; preds = %for.cond.i.i
-+  br label %while.cond.i.i, !dbg !32 ; line:5 col:5
-+
-+while.cond.i.i:                                   ; preds = %while.cond.i.i.preheader, %while.cond.i.i
-+  br label %while.cond.i.i, !dbg !32 ; line:5 col:5
-+
-+"\01?f@@YAXXZ.exit.i":                            ; preds = %for.cond.i.i
-+  %DerivFineX = call float @dx.op.unary.f32(i32 85, float %g.i.0.i0), !dbg !33 ; line:21 col:21  ; DerivFineX(value)
-+  %DerivFineX1 = call float @dx.op.unary.f32(i32 85, float %g.i.0.i1), !dbg !33 ; line:21 col:21  ; DerivFineX(value)
-+  %DerivFineX2 = call float @dx.op.unary.f32(i32 85, float %g.i.0.i2), !dbg !33 ; line:21 col:21  ; DerivFineX(value)
-+  %DerivFineX3 = call float @dx.op.unary.f32(i32 85, float %g.i.0.i3), !dbg !33 ; line:21 col:21  ; DerivFineX(value)
-+  %6 = getelementptr inbounds [2 x i32], [2 x i32]* %1, i32 0, i32 0, !dbg !34 ; line:22 col:15
-+  %7 = load i32, i32* %6, align 4, !dbg !34 ; line:22 col:15
-+  %8 = getelementptr [2 x i32], [2 x i32]* %1, i32 0, i32 %7, !dbg !35 ; line:22 col:11
-+  %9 = load i32, i32* %8, !dbg !35, !tbaa !36 ; line:22 col:11
-+  %cmp6.i = icmp eq i32 %9, 2, !dbg !40 ; line:22 col:22
-+  br i1 %cmp6.i, label %if.end.i, label %for.cond.i.19.i, !dbg !35 ; line:22 col:11
-+
-+for.cond.i.19.i:                                  ; preds = %"\01?f@@YAXXZ.exit.i"
-+  br i1 true, label %while.cond.i.24.i.preheader, label %if.end.i, !dbg !41 ; line:4 col:3
-+
-+while.cond.i.24.i.preheader:                      ; preds = %for.cond.i.19.i
-+  br label %while.cond.i.24.i, !dbg !43 ; line:5 col:5
-+
-+while.cond.i.24.i:                                ; preds = %while.cond.i.24.i.preheader, %while.cond.i.24.i
-+  br label %while.cond.i.24.i, !dbg !43 ; line:5 col:5
-+
-+if.end.i:                                         ; preds = %for.cond.i.19.i, %"\01?f@@YAXXZ.exit.i"
-+  %g.i.1.i0 = phi float [ %DerivFineX, %"\01?f@@YAXXZ.exit.i" ], [ %g.i.0.i0, %for.cond.i.19.i ]
-+  %g.i.1.i1 = phi float [ %DerivFineX1, %"\01?f@@YAXXZ.exit.i" ], [ %g.i.0.i1, %for.cond.i.19.i ]
-+  %g.i.1.i2 = phi float [ %DerivFineX2, %"\01?f@@YAXXZ.exit.i" ], [ %g.i.0.i2, %for.cond.i.19.i ]
-+  %g.i.1.i3 = phi float [ %DerivFineX3, %"\01?f@@YAXXZ.exit.i" ], [ %g.i.0.i3, %for.cond.i.19.i ]
-+  %10 = getelementptr inbounds [2 x i32], [2 x i32]* %1, i32 0, i32 0, !dbg !44 ; line:27 col:14
-+  %11 = load i32, i32* %10, align 4, !dbg !44 ; line:27 col:14
-+  switch i32 %11, label %sw.default.i [
-+    i32 3, label %for.cond.i.5.i
-+    i32 2, label %sw.bb.10.i
-+  ], !dbg !45 ; line:27 col:7
-+
-+sw.bb.10.i:                                       ; preds = %if.end.i
-+  br label %for.cond.i.5.i, !dbg !46 ; line:33 col:11
-+
-+sw.default.i:                                     ; preds = %if.end.i
-+  br label %for.cond.i.5.i, !dbg !47 ; line:38 col:7
-+
-+for.cond.i.5.i:                                   ; preds = %if.end.i, %sw.bb.10.i, %sw.default.i
-+  %g.i.2.i0 = phi float [ %DerivFineX, %sw.default.i ], [ %DerivFineX, %sw.bb.10.i ], [ %g.i.1.i0, %if.end.i ]
-+  %g.i.2.i1 = phi float [ %DerivFineX1, %sw.default.i ], [ %DerivFineX1, %sw.bb.10.i ], [ %g.i.1.i1, %if.end.i ]
-+  %g.i.2.i2 = phi float [ %DerivFineX2, %sw.default.i ], [ %DerivFineX2, %sw.bb.10.i ], [ %g.i.1.i2, %if.end.i ]
-+  %g.i.2.i3 = phi float [ %DerivFineX3, %sw.default.i ], [ %DerivFineX3, %sw.bb.10.i ], [ %g.i.1.i3, %if.end.i ]
-+  br i1 true, label %while.cond.i.10.i.preheader, label %do.cond.i, !dbg !48 ; line:4 col:3
-+
-+while.cond.i.10.i.preheader:                      ; preds = %for.cond.i.5.i
-+  br label %while.cond.i.10.i, !dbg !50 ; line:5 col:5
-+
-+while.cond.i.10.i:                                ; preds = %while.cond.i.10.i.preheader, %while.cond.i.10.i
-+  br label %while.cond.i.10.i, !dbg !50 ; line:5 col:5
-+
-+do.cond.i:                                        ; preds = %for.cond.i.5.i, %do.body.i
-+  %g.i.3.i0 = phi float [ %g.i.0.i0, %do.body.i ], [ %g.i.2.i0, %for.cond.i.5.i ]
-+  %g.i.3.i1 = phi float [ %g.i.0.i1, %do.body.i ], [ %g.i.2.i1, %for.cond.i.5.i ]
-+  %g.i.3.i2 = phi float [ %g.i.0.i2, %do.body.i ], [ %g.i.2.i2, %for.cond.i.5.i ]
-+  %g.i.3.i3 = phi float [ %g.i.0.i3, %do.body.i ], [ %g.i.2.i3, %for.cond.i.5.i ]
-+  br i1 false, label %do.body.i, label %"\01?main_inner@@YA?AV?$vector@M$03@@XZ.exit", !dbg !51 ; line:41 col:3
-+
-+"\01?main_inner@@YA?AV?$vector@M$03@@XZ.exit":    ; preds = %do.cond.i
-+  %g.i.3.i3.lcssa = phi float [ %g.i.3.i3, %do.cond.i ]
-+  %g.i.3.i2.lcssa = phi float [ %g.i.3.i2, %do.cond.i ]
-+  %g.i.3.i1.lcssa = phi float [ %g.i.3.i1, %do.cond.i ]
-+  %g.i.3.i0.lcssa = phi float [ %g.i.3.i0, %do.cond.i ]
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float %g.i.3.i0.lcssa), !dbg !52 ; line:49 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float %g.i.3.i1.lcssa), !dbg !52 ; line:49 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float %g.i.3.i2.lcssa), !dbg !52 ; line:49 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %g.i.3.i3.lcssa), !dbg !52 ; line:49 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  ret void, !dbg !53 ; line:49 col:3
-+}
-+
-+; Function Attrs: nounwind
-+declare void @dx.op.storeOutput.f32(i32, i32, i32, i8, float) #0
-+
-+; Function Attrs: nounwind readnone
-+declare float @dx.op.unary.f32(i32, float) #1
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readnone }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.typeAnnotations = !{!6, !9}
-+!dx.entryPoints = !{!16}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-+!2 = !{!"dxc(private) 1.8.0.14549 (main, 0781ded87-dirty)"}
-+!3 = !{i32 1, i32 0}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"ps", i32 6, i32 0}
-+!6 = !{i32 0, %struct.tint_symbol undef, !7}
-+!7 = !{i32 16, !8}
-+!8 = !{i32 6, !"value", i32 3, i32 0, i32 4, !"SV_Target0", i32 7, i32 9}
-+!9 = !{i32 1, void (<4 x float>*)* @main, !10}
-+!10 = !{!11, !13}
-+!11 = !{i32 0, !12, !12}
-+!12 = !{}
-+!13 = !{i32 1, !14, !15}
-+!14 = !{i32 4, !"SV_Target0", i32 7, i32 9}
-+!15 = !{i32 0}
-+!16 = !{void (<4 x float>*)* @main, !"main", !17, null, null}
-+!17 = !{null, !18, null}
-+!18 = !{!19}
-+!19 = !{i32 0, !"SV_Target", i8 9, i8 16, !15, i8 0, i32 1, i8 4, i32 0, i8 0, null}
-+!20 = !DILocation(line: 17, column: 9, scope: !21, inlinedAt: !24)
-+!21 = !DISubprogram(name: "main_inner", scope: !22, file: !22, line: 14, type: !23, isLocal: false, isDefinition: true, scopeLine: 14, flags: DIFlagPrototyped, isOptimized: false)
-+!22 = !DIFile(filename: "s2.hlsl", directory: "")
-+!23 = !DISubroutineType(types: !12)
-+!24 = distinct !DILocation(line: 46, column: 25, scope: !25)
-+!25 = !DISubprogram(name: "main", scope: !22, file: !22, line: 45, type: !23, isLocal: false, isDefinition: true, scopeLine: 45, flags: DIFlagPrototyped, isOptimized: false, function: void (<4 x float>*)* @main)
-+!26 = !DILocation(line: 18, column: 3, scope: !21, inlinedAt: !24)
-+!27 = !DILocation(line: 19, column: 9, scope: !21, inlinedAt: !24)
-+!28 = !DILocation(line: 19, column: 15, scope: !21, inlinedAt: !24)
-+!29 = !DILocation(line: 4, column: 3, scope: !30, inlinedAt: !31)
-+!30 = !DISubprogram(name: "f", scope: !22, file: !22, line: 2, type: !23, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: false)
-+!31 = distinct !DILocation(line: 20, column: 7, scope: !21, inlinedAt: !24)
-+!32 = !DILocation(line: 5, column: 5, scope: !30, inlinedAt: !31)
-+!33 = !DILocation(line: 21, column: 21, scope: !21, inlinedAt: !24)
-+!34 = !DILocation(line: 22, column: 15, scope: !21, inlinedAt: !24)
-+!35 = !DILocation(line: 22, column: 11, scope: !21, inlinedAt: !24)
-+!36 = !{!37, !37, i64 0}
-+!37 = !{!"int", !38, i64 0}
-+!38 = !{!"omnipotent char", !39, i64 0}
-+!39 = !{!"Simple C/C++ TBAA"}
-+!40 = !DILocation(line: 22, column: 22, scope: !21, inlinedAt: !24)
-+!41 = !DILocation(line: 4, column: 3, scope: !30, inlinedAt: !42)
-+!42 = distinct !DILocation(line: 25, column: 9, scope: !21, inlinedAt: !24)
-+!43 = !DILocation(line: 5, column: 5, scope: !30, inlinedAt: !42)
-+!44 = !DILocation(line: 27, column: 14, scope: !21, inlinedAt: !24)
-+!45 = !DILocation(line: 27, column: 7, scope: !21, inlinedAt: !24)
-+!46 = !DILocation(line: 33, column: 11, scope: !21, inlinedAt: !24)
-+!47 = !DILocation(line: 38, column: 7, scope: !21, inlinedAt: !24)
-+!48 = !DILocation(line: 4, column: 3, scope: !30, inlinedAt: !49)
-+!49 = distinct !DILocation(line: 39, column: 7, scope: !21, inlinedAt: !24)
-+!50 = !DILocation(line: 5, column: 5, scope: !30, inlinedAt: !49)
-+!51 = !DILocation(line: 41, column: 3, scope: !21, inlinedAt: !24)
-+!52 = !DILocation(line: 49, column: 10, scope: !25)
-+!53 = !DILocation(line: 49, column: 3, scope: !25)

patches/DirectXShaderCompiler/cherry-pick-511cfef8e050.patch

@@ -1,243 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Mon, 27 May 2024 15:41:40 -0400
-Subject: Fix use-after-free in SimplifyCFG (#6628)
-
-When SimplifySwitchOnSelect calls SimplifyTerminatorOnSelect, it holds
-onto the select's condition value to use for the conditional branch it
-replaces the switch with. When removing the switch's unused
-predecessors, it must make sure not to delete PHIs in case one of them
-is used by the condition value, otherwise the condition value itself may
-get deleted, resulting in an use-after-free.
-
-Note that this was fixed in LLVM as well:
-
-https://github.com/llvm/llvm-project/commit/dc3b67b4cad5c18a687edfabd50779c3c656c620
-
-Bug: chromium:338103465
-Change-Id: Iff5d5f2e3ecf38a3fb22bbc65e7c33ad0de659fb
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5570018
-Reviewed-by: James Price <jrprice@google.com>
-Reviewed-by: Natalie Chouinard <chouinard@chromium.org>
-
-diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
-index b45caa2929a5cc3aa064fdbd9c06c20ad9e1e155..0d3ba1e00719060c1e71fa238726f0c63bd5b32f 100644
---- a/lib/Transforms/Utils/SimplifyCFG.cpp
-+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
-@@ -2619,7 +2619,10 @@ static bool SimplifyTerminatorOnSelect(TerminatorInst *OldTerm, Value *Cond,
-     else if (Succ == KeepEdge2)
-       KeepEdge2 = nullptr;
-     else
--      Succ->removePredecessor(OldTerm->getParent());
-+      Succ->removePredecessor(
-+          OldTerm->getParent(),
-+          /*DontDeleteUselessPHIs=*/true // HLSL Change: foward port LLVM fix
-+      );
-   }
- 
-   IRBuilder<> Builder(OldTerm);
-diff --git a/tools/clang/test/DXC/Passes/SimplifyCFG/simplifycfg-uaf-select-condition.ll b/tools/clang/test/DXC/Passes/SimplifyCFG/simplifycfg-uaf-select-condition.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..149906c11285ed99a19c0fe1743801a795827792
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/SimplifyCFG/simplifycfg-uaf-select-condition.ll
-@@ -0,0 +1,199 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -simplifycfg -S | FileCheck %s
-+
-+; The IR below comes from the following HLSL.
-+; Compiling this HLSL with dxc was resulting in an ASAN
-+; use-after-free in SimplifyCFG during
-+; SimplifyTerminatorOnSelect because it was deleting
-+; a PHI node with an input value that the pass later
-+; emits (the select condition value).
-+
-+; ByteAddressBuffer buff : register(t0);
-+;
-+; [numthreads(1, 1, 1)]
-+; void main() {
-+;   if (buff.Load(0u)) {
-+;     return;
-+;   }
-+;
-+;   int i = 0;
-+;   int j = 0;
-+;   while (true) {
-+;     bool a = (i < 2);
-+;     switch(i) {
-+;       case 0: {
-+;         while (true) {
-+;           bool b = (j < 2);
-+;           if (b) {
-+;           } else {
-+;             break;
-+;           }
-+;           while (true) {
-+;             int unused = 0;
-+;             while (true) {
-+;               if (a) break;
-+;             }
-+;             while (true) {
-+;               while (true) {
-+;                 if (b) {
-+;                   if (b) return;
-+;                 } else {
-+;                   break;
-+;                 }
-+;                 while (true) {
-+;                   i = 0;
-+;                   if (b) break;
-+;                 }
-+;                 if (a) break;
-+;               }
-+;               if (a) break;
-+;             }
-+;             if (a) break;
-+;           }
-+;           j = (j + 2);
-+;         }
-+;       }
-+;     }
-+;   }
-+; }
-+
-+; Make sure the phi node did not get deleted by simplifycfg
-+; CHECK:       cleanup:
-+; CHECK-NEXT:    %cleanup.dest.slot.0 = phi i32 [ 1, %while.body.20 ], [ %.mux, %while.end.37 ]
-+; CHECK-NEXT:    switch i32 %cleanup.dest.slot.0, label %cleanup.46 [
-+
-+;
-+; Buffer Definitions:
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; buff                              texture    byte         r/o      T0             t0     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%struct.ByteAddressBuffer = type { i32 }
-+%dx.types.Handle = type { i8* }
-+%dx.types.ResourceProperties = type { i32, i32 }
-+
-+@"\01?buff@@3UByteAddressBuffer@@A" = external global %struct.ByteAddressBuffer, align 4
-+
-+; Function Attrs: nounwind
-+define void @main() #0 {
-+entry:
-+  %0 = load %struct.ByteAddressBuffer, %struct.ByteAddressBuffer* @"\01?buff@@3UByteAddressBuffer@@A", !dbg !17 ; line:5 col:7
-+  %1 = call %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %struct.ByteAddressBuffer)"(i32 0, %struct.ByteAddressBuffer %0), !dbg !17 ; line:5 col:7
-+  %2 = call %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer)"(i32 14, %dx.types.Handle %1, %dx.types.ResourceProperties { i32 11, i32 0 }, %struct.ByteAddressBuffer undef), !dbg !17 ; line:5 col:7
-+  %3 = call i32 @"dx.hl.op.ro.i32 (i32, %dx.types.Handle, i32)"(i32 231, %dx.types.Handle %2, i32 0), !dbg !17 ; line:5 col:7
-+  %tobool = icmp ne i32 %3, 0, !dbg !17 ; line:5 col:7
-+  br i1 %tobool, label %return, label %while.body, !dbg !17 ; line:5 col:7
-+
-+while.body:                                       ; preds = %while.body.3, %while.body, %cleanup.46, %entry
-+  %j.0 = phi i32 [ 0, %entry ], [ %j.1, %cleanup.46 ], [ %j.0, %while.body ], [ %j.1, %while.body.3 ]
-+  %i.0 = phi i32 [ 0, %entry ], [ %i.1, %cleanup.46 ], [ %i.0, %while.body ], [ %i.1, %while.body.3 ]
-+  %cmp = icmp slt i32 %i.0, 2, !dbg !21 ; line:12 col:17
-+  %cond = icmp eq i32 %i.0, 0, !dbg !22 ; line:13 col:5
-+  br i1 %cond, label %while.body.3, label %while.body, !dbg !22 ; line:13 col:5
-+
-+while.body.3:                                     ; preds = %cleanup.46.thread, %while.body, %cleanup.46
-+  %j.1 = phi i32 [ %j.1, %cleanup.46 ], [ %j.0, %while.body ], [ %add, %cleanup.46.thread ]
-+  %i.1 = phi i32 [ %i.1, %cleanup.46 ], [ %i.0, %while.body ], [ %i.1, %cleanup.46.thread ]
-+  %cmp4 = icmp slt i32 %j.1, 2, !dbg !23 ; line:16 col:23
-+  br i1 %cmp4, label %while.body.11, label %while.body, !dbg !24 ; line:17 col:15
-+
-+while.body.11:                                    ; preds = %while.body.3, %cleanup
-+  br label %while.body.13, !dbg !25 ; line:23 col:13
-+
-+while.body.13:                                    ; preds = %while.body.13, %while.body.11
-+  br i1 %cmp, label %while.body.20, label %while.body.13, !dbg !26 ; line:24 col:19
-+
-+while.body.20:                                    ; preds = %while.body.13, %while.end.37
-+  br i1 %cmp4, label %cleanup, label %while.end.37, !dbg !27 ; line:28 col:21
-+
-+while.end.37:                                     ; preds = %while.body.20
-+  br i1 %cmp, label %cleanup, label %while.body.20, !dbg !28 ; line:39 col:19
-+
-+cleanup:                                          ; preds = %while.end.37, %while.body.20
-+  %cleanup.dest.slot.0 = phi i32 [ 1, %while.body.20 ], [ 8, %while.end.37 ]
-+  switch i32 %cleanup.dest.slot.0, label %cleanup.46 [
-+    i32 0, label %while.body.11
-+    i32 8, label %cleanup.46.thread
-+  ]
-+
-+cleanup.46.thread:                                ; preds = %cleanup
-+  %add = add nsw i32 %j.1, 2, !dbg !29 ; line:43 col:18
-+  br label %while.body.3
-+
-+cleanup.46:                                       ; preds = %cleanup
-+  switch i32 %cleanup.dest.slot.0, label %return [
-+    i32 0, label %while.body.3
-+    i32 6, label %while.body
-+  ]
-+
-+return:                                           ; preds = %cleanup.46, %entry
-+  ret void, !dbg !30 ; line:48 col:1
-+}
-+
-+; Function Attrs: nounwind
-+declare void @llvm.lifetime.start(i64, i8* nocapture) #0
-+
-+; Function Attrs: nounwind
-+declare void @llvm.lifetime.end(i64, i8* nocapture) #0
-+
-+; Function Attrs: nounwind readonly
-+declare i32 @"dx.hl.op.ro.i32 (i32, %dx.types.Handle, i32)"(i32, %dx.types.Handle, i32) #1
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %struct.ByteAddressBuffer)"(i32, %struct.ByteAddressBuffer) #2
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer)"(i32, %dx.types.Handle, %dx.types.ResourceProperties, %struct.ByteAddressBuffer) #2
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readonly }
-+attributes #2 = { nounwind readnone }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.typeAnnotations = !{!6}
-+!dx.entryPoints = !{!10}
-+!dx.fnprops = !{!14}
-+!dx.options = !{!15, !16}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-hlemit", !"hlsl-hlensure"}
-+!2 = !{!"dxc(private) 1.8.0.4514 (d9bd2a706-dirty)"}
-+!3 = !{i32 1, i32 6}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"cs", i32 6, i32 6}
-+!6 = !{i32 1, void ()* @main, !7}
-+!7 = !{!8}
-+!8 = !{i32 1, !9, !9}
-+!9 = !{}
-+!10 = !{void ()* @main, !"main", null, !11, null}
-+!11 = !{!12, null, null, null}
-+!12 = !{!13}
-+!13 = !{i32 0, %struct.ByteAddressBuffer* @"\01?buff@@3UByteAddressBuffer@@A", !"buff", i32 0, i32 0, i32 1, i32 11, i32 0, null}
-+!14 = !{void ()* @main, i32 5, i32 1, i32 1, i32 1}
-+!15 = !{i32 64}
-+!16 = !{i32 -1}
-+!17 = !DILocation(line: 5, column: 7, scope: !18)
-+!18 = !DISubprogram(name: "main", scope: !19, file: !19, line: 4, type: !20, isLocal: false, isDefinition: true, scopeLine: 4, flags: DIFlagPrototyped, isOptimized: false, function: void ()* @main)
-+!19 = !DIFile(filename: "/mnt/c/Users/amaiorano/Downloads/338103465/standalone_reduced.hlsl", directory: "")
-+!20 = !DISubroutineType(types: !9)
-+!21 = !DILocation(line: 12, column: 17, scope: !18)
-+!22 = !DILocation(line: 13, column: 5, scope: !18)
-+!23 = !DILocation(line: 16, column: 23, scope: !18)
-+!24 = !DILocation(line: 17, column: 15, scope: !18)
-+!25 = !DILocation(line: 23, column: 13, scope: !18)
-+!26 = !DILocation(line: 24, column: 19, scope: !18)
-+!27 = !DILocation(line: 28, column: 21, scope: !18)
-+!28 = !DILocation(line: 39, column: 19, scope: !18)
-+!29 = !DILocation(line: 43, column: 18, scope: !18)
-+!30 = !DILocation(line: 48, column: 1, scope: !18)

patches/DirectXShaderCompiler/cherry-pick-771e74ab497d.patch

@@ -1,116 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Thu, 20 Jun 2024 14:02:42 -0400
-Subject: indvars: don't replace a phi when that breaks LCSSA (#6695)
-
-Induction variable simplification (indvars) tries to rewrite exit
-values; these appear as phi nodes in loop exit blocks. If the
-replacement for the phi is still in the loop, then that would break the
-LCSSA property. Don't do that.
-
-Add a test for this.
-
-Bug: chromium:345993680
-Change-Id: Ib2330afa3c6f47373cb4336cfd00e851044fea3a
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5645925
-Reviewed-by: dan sinclair <dsinclair@chromium.org>
-Reviewed-by: James Price <jrprice@google.com>
-
-diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp
-index f5b1455d5932b63dfef699991c5eeab38e447a7d..e6ff7b3ab4d81bbb782f0bd0a7b5185a30fd1285 100644
---- a/lib/Transforms/Scalar/IndVarSimplify.cpp
-+++ b/lib/Transforms/Scalar/IndVarSimplify.cpp
-@@ -24,7 +24,6 @@
- //
- //===----------------------------------------------------------------------===//
- 
--#include "llvm/Transforms/Scalar.h"
- #include "llvm/ADT/DenseMap.h"
- #include "llvm/ADT/SmallVector.h"
- #include "llvm/ADT/Statistic.h"
-@@ -41,11 +40,13 @@
- #include "llvm/IR/Instructions.h"
- #include "llvm/IR/IntrinsicInst.h"
- #include "llvm/IR/LLVMContext.h"
-+#include "llvm/IR/Module.h"
- #include "llvm/IR/PatternMatch.h"
- #include "llvm/IR/Type.h"
- #include "llvm/Support/CommandLine.h"
- #include "llvm/Support/Debug.h"
- #include "llvm/Support/raw_ostream.h"
-+#include "llvm/Transforms/Scalar.h"
- #include "llvm/Transforms/Utils/BasicBlockUtils.h"
- #include "llvm/Transforms/Utils/Local.h"
- #include "llvm/Transforms/Utils/SimplifyIndVar.h"
-@@ -698,6 +699,16 @@ void IndVarSimplify::RewriteLoopExitValues(Loop *L, SCEVExpander &Rewriter) {
-           continue;
-         }
- 
-+        // HLSL Change Begin
-+        // Avoid breaking LCSSA: Don't replace the PHI if its replacement
-+        // is defined inside the loop.
-+        if (auto *ExitValInst = dyn_cast<Instruction>(ExitVal)) {
-+          if (L->contains(ExitValInst)) {
-+            continue;
-+          }
-+        }
-+        // HLSL Change End
-+
-         // Collect all the candidate PHINodes to be rewritten.
-         RewritePhiSet.push_back(
-             RewritePhi(PN, i, ExitVal, HighCost, LCSSASafePhiForRAUW));
-diff --git a/test/HLSL/passes/indvars/preserve-phi-when-replacement-is-in-loop.ll b/test/HLSL/passes/indvars/preserve-phi-when-replacement-is-in-loop.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..b550ce993837814229f8223a47b2af328cc7c87c
---- /dev/null
-+++ b/test/HLSL/passes/indvars/preserve-phi-when-replacement-is-in-loop.ll
-@@ -0,0 +1,49 @@
-+; RUN: opt < %s -indvars -S | FileCheck %s
-+
-+; The inner loop (%header1) has a fixed trip count.
-+; The indvars pass is tempted to delete the phi instruction %hexit,
-+; and replace its uses with %add3.
-+; But %hexit is used in %latch0, which is outside the inner loop and
-+; its exit block. Deleting the phi %hexit would break LCSSA form.
-+
-+; CHECK: @main
-+; CHECK: exit1:
-+; CHECK-NEXT: %hexit = phi i32 [ %hnext, %header1 ]
-+; CHECK-NEXT: br label %latch0
-+
-+; CHECK: latch0:
-+
-+target triple = "dxil-ms-dx"
-+
-+define void @main(i32 %arg) {
-+entry:
-+  br label %header0
-+
-+header0:
-+  %isgt0 = icmp sgt i32 %arg, 0
-+  %smax = select i1 %isgt0, i32 %arg, i32 0
-+  %h0 = add i32 %smax, 1
-+  %j0 = add i32 %smax, 2
-+  %doinner = icmp slt i32 %j0, 1
-+  br i1 %doinner, label %header1.pre, label %latch0
-+
-+header1.pre:
-+  br label %header1
-+
-+header1:
-+  %hi = phi i32 [ %hnext, %header1 ], [ %h0, %header1.pre ]
-+  %ji = phi i32 [ %jnext, %header1 ], [ %j0, %header1.pre ]
-+  %add3 = add i32 %smax, 3
-+  %hnext = add i32 %hi, 1
-+  %jnext = add nsw i32 %ji, 1 ; the nsw here is essential
-+  %do1again = icmp slt i32 %ji, %add3
-+  br i1 %do1again, label %header1, label %exit1
-+
-+exit1:
-+  %hexit = phi i32 [ %hnext, %header1 ]
-+  br label %latch0
-+
-+latch0:
-+  %useh = phi i32 [ %h0, %header0 ], [ %hexit, %exit1 ]
-+  br label %header0
-+}

patches/DirectXShaderCompiler/cherry-pick-867c1001637e.patch

@@ -1,108 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Thu, 16 May 2024 14:24:27 -0400
-Subject: Fix invalid module bitcode when indexing a swizzled bool vector
- (#6582)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When indexing a swizzled bool vector, some HLSL-specific code in
-EmitCXXMemberOrOperatorMemberCallExpr kicks in to handle the
-HLSLVecType. In this case, we’re dealing with an ExtVectorElt because of
-the swizzle, so this function creates a GEP, Load, and Store on the
-vector. However, boolean scalars are returned as type i11 while the
-store is storing to a bool, which is an i32, so we need to insert a cast
-before the store.
-
-Bug: chromium:338161969
-Change-Id: I45f8ec383be49210a10f725d8266b66fd30c34be
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5545820
-Reviewed-by: James Price <jrprice@google.com>
-Reviewed-by: dan sinclair <dsinclair@google.com>
-
-diff --git a/tools/clang/lib/CodeGen/CGExpr.cpp b/tools/clang/lib/CodeGen/CGExpr.cpp
-index cc46d067e617f1032bd7bc3ea6f65276984df130..efef0593b334103e511d43e3986fed3c304d28a3 100644
---- a/tools/clang/lib/CodeGen/CGExpr.cpp
-+++ b/tools/clang/lib/CodeGen/CGExpr.cpp
-@@ -1137,6 +1137,12 @@ llvm::MDNode *CodeGenFunction::getRangeForLoadFromType(QualType Ty) {
-   return MDHelper.createRange(Min, End);
- }
- 
-+static bool ShouldEmitRangeMD(llvm::Value *Value, QualType Ty) {
-+  if (hasBooleanRepresentation(Ty))
-+    return cast<llvm::IntegerType>(Value->getType())->getBitWidth() != 1;
-+  return true;
-+}
-+
- llvm::Value *CodeGenFunction::EmitLoadOfScalar(llvm::Value *Addr, bool Volatile,
-                                                unsigned Alignment, QualType Ty,
-                                                SourceLocation Loc,
-@@ -1236,7 +1242,8 @@ llvm::Value *CodeGenFunction::EmitLoadOfScalar(llvm::Value *Addr, bool Volatile,
-       EmitCheck(std::make_pair(Check, Kind), "load_invalid_value", StaticArgs,
-                 EmitCheckValue(Load));
-     }
--  } else if (CGM.getCodeGenOpts().OptimizationLevel > 0)
-+  } else if (CGM.getCodeGenOpts().OptimizationLevel > 0 &&
-+             ShouldEmitRangeMD(Load, Ty))
-     if (llvm::MDNode *RangeInfo = getRangeForLoadFromType(Ty))
-       Load->setMetadata(llvm::LLVMContext::MD_range, RangeInfo);
- 
-diff --git a/tools/clang/lib/CodeGen/CGExprCXX.cpp b/tools/clang/lib/CodeGen/CGExprCXX.cpp
-index 2efde7c30f7f25fed5b36fe7de062b31e6cd74a2..924a0f806e7a8acf310005a212bb3c50a3c519b9 100644
---- a/tools/clang/lib/CodeGen/CGExprCXX.cpp
-+++ b/tools/clang/lib/CodeGen/CGExprCXX.cpp
-@@ -235,12 +235,17 @@ RValue CodeGenFunction::EmitCXXMemberOrOperatorMemberCallExpr(
- 
-           llvm::Constant *zero = Builder.getInt32(0);
-           llvm::Value *TmpThis = CreateTempAlloca(Ty);
-+          QualType ElTy = hlsl::GetElementTypeOrType(Base->getType());
-+          bool IsBool = ElTy->isSpecificBuiltinType(BuiltinType::Bool);
-           for (unsigned i = 0; i < Ty->getVectorNumElements(); i++) {
-             llvm::Value *EltIdx = Elts->getAggregateElement(i);
-             llvm::Value *EltGEP = Builder.CreateGEP(This, {zero, EltIdx});
-             llvm::Value *TmpEltGEP =
-                 Builder.CreateGEP(TmpThis, {zero, Builder.getInt32(i)});
-             llvm::Value *Elt = Builder.CreateLoad(EltGEP);
-+            if (IsBool)
-+              Elt = Builder.CreateTrunc(
-+                  Elt, llvm::Type::getInt1Ty(getLLVMContext()));
-             Builder.CreateStore(Elt, TmpEltGEP);
-           }
-           This = TmpThis;
-diff --git a/tools/clang/test/CodeGenDXIL/operators/swizzle/indexSwizzledBoolVec.hlsl b/tools/clang/test/CodeGenDXIL/operators/swizzle/indexSwizzledBoolVec.hlsl
-new file mode 100644
-index 0000000000000000000000000000000000000000..a47482d204547d01b8f237bdde0765e61e6b7ab0
---- /dev/null
-+++ b/tools/clang/test/CodeGenDXIL/operators/swizzle/indexSwizzledBoolVec.hlsl
-@@ -0,0 +1,30 @@
-+// Test indexing a swizzled bool vector
-+// RUN: %dxc -fcgl -T cs_6_0 %s | FileCheck %s
-+
-+// This was asserting in Instructions.cpp with:
-+// void llvm::StoreInst::AssertOK(): Assertion `getOperand(0)->getType() == cast<PointerType>(getOperand(1)->getType())->getElementType() && "Ptr must be a pointer to Val type!"' failed.
-+
-+// Make sure load of i32 gets truncated to i1 when indexing bool vectors
-+// CHECK:       [[TMP:%[a-z0-9\.]+]] = alloca <2 x i1>
-+// CHECK:       [[VA0:%[a-z0-9\.]+]] = getelementptr <2 x i1>, <2 x i1>* [[TMP]], i32 0, i32 0,
-+// CHECK-NEXT:  [[VA1:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds (<4 x i32>, <4 x i32>* @"\01?v_bool4@?1??main@@YAXXZ@3V?$vector@_N$03@@B", i32 0, i32 2),
-+// CHECK-NEXT:  [[VA2:%[a-z0-9\.]+]] = trunc i32 [[VA1]] to i1,
-+// CHECK-NEXT:  store i1 [[VA2]], i1* [[VA0]],
-+// CHECK-NEXT:  [[VB0:%[a-z0-9\.]+]] = getelementptr <2 x i1>, <2 x i1>* [[TMP]], i32 0, i32 1,
-+// CHECK-NEXT:  [[VB1:%[a-z0-9\.]+]] = load i32, i32* getelementptr inbounds (<4 x i32>, <4 x i32>* @"\01?v_bool4@?1??main@@YAXXZ@3V?$vector@_N$03@@B", i32 0, i32 3),
-+// CHECK-NEXT:  [[VB2:%[a-z0-9\.]+]] = trunc i32 [[VB1]] to i1,
-+// CHECK-NEXT:  store i1 [[VB2]], i1* [[VB0]],
-+
-+
-+cbuffer cbuffer_tint_symbol_3 : register(b0) {
-+    uint4 global_uint4[1];
-+};
-+
-+[numthreads(1, 1, 1)]
-+void main() {
-+    const bool4 v_bool4 = bool4(true, true, true, true);
-+    const uint gx = global_uint4[0].x;
-+    if (v_bool4.zw[gx] == 0) {
-+        GroupMemoryBarrierWithGroupSync();
-+    }
-+}

patches/DirectXShaderCompiler/cherry-pick-8f07d39227f6.patch

@@ -1,151 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Thu, 20 Jun 2024 14:49:58 -0400
-Subject: Fix crash in scalarrepl-param-hlsl when dynamically indexing a GEP of
- a constant indexed GEP (#6670)
-
-When processing global values to determine when to flatten vectors, this
-pass was only checking the immdiate users of the value for non-dynamic
-indexing of the vector. But this would fail in the case of a dynamic
-indexed GEP of a constant indexed GEP (e.g. h[0][a]) because the first
-level GEP was constant indexed, but not the second. We fix this by
-checking the full User tree of the value in `hasDynamicVectorIndexing`.
-
-Bug: chromium:342428008
-Change-Id: Ibf2ae3a6528cfc9b50634058385c5a45aa1d3b75
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5645927
-Reviewed-by: James Price <jrprice@google.com>
-Reviewed-by: dan sinclair <dsinclair@chromium.org>
-
-diff --git a/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp b/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-index 9b843ef0e49e554001b827e30eb6256853d90f5b..b1b38c0ee038dedb2064f5726663992a5bec736b 100644
---- a/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-+++ b/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-@@ -1645,6 +1645,10 @@ bool hasDynamicVectorIndexing(Value *V) {
-         }
-       }
-     }
-+    // Also recursively check the uses of this User to find a possible
-+    // dynamically indexed GEP of this GEP.
-+    if (hasDynamicVectorIndexing(U))
-+      return true;
-   }
-   return false;
- }
-diff --git a/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-dyn-idx-gep-of-const-idx-gep.ll b/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-dyn-idx-gep-of-const-idx-gep.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..04fdea1500e75266a59705a1c2da98a4aef7391c
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/ScalarReplHLSL/scalarrepl-param-hlsl-dyn-idx-gep-of-const-idx-gep.ll
-@@ -0,0 +1,111 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -scalarrepl-param-hlsl -S | FileCheck %s
-+
-+; Produced from the following HLSL:
-+;   static int4 g[4] = (int4[4])0;
-+;   static int4 h[4] = (int4[4])0;
-+;
-+;   [numthreads(1, 1, 1)]
-+;   void main() {
-+;     int a = 0;
-+;     int b = h[0][a];
-+;     h = g;
-+;   }
-+;
-+; This was crashing in scalarrepl-param-hlsl because it was attempting to flatten
-+; global variable 'h' even though it is dynamically indexed. This was not detected
-+; because the resulting IR was a dynamically indexed GEP of a constant-indexed GEP,
-+; and the code was only checking the immediate users of 'h':
-+;
-+;  %1 = getelementptr <4 x i32>, <4 x i32>* getelementptr inbounds ([4 x <4 x i32>], [4 x <4 x i32>]* @h, i32 0, i32 0), i32 0, i32 %0, !dbg !26 ; line:7 col:11
-+;
-+; Verify that it does not get flattened
-+; CHECK: %1 = getelementptr <4 x i32>, <4 x i32>* getelementptr inbounds ([4 x <4 x i32>], [4 x <4 x i32>]* @g, i32 0, i32 0), i32 0, i32 %0
-+
-+;
-+; Buffer Definitions:
-+;
-+; cbuffer $Globals
-+; {
-+;
-+;   [0 x i8] (type annotation not present)
-+;
-+; }
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; $Globals                          cbuffer      NA          NA     CB0   cb4294967295     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%ConstantBuffer = type opaque
-+
-+@h = internal global [4 x <4 x i32>] zeroinitializer, align 4
-+@g = internal global [4 x <4 x i32>] zeroinitializer, align 4
-+@"$Globals" = external constant %ConstantBuffer
-+
-+; Function Attrs: nounwind
-+define void @main() #0 {
-+entry:
-+  %a = alloca i32, align 4
-+  %b = alloca i32, align 4
-+  store i32 0, i32* %a, align 4, !dbg !17, !tbaa !21 ; line:6 col:7
-+  %0 = load i32, i32* %a, align 4, !dbg !25, !tbaa !21 ; line:7 col:16
-+  %1 = getelementptr <4 x i32>, <4 x i32>* getelementptr inbounds ([4 x <4 x i32>], [4 x <4 x i32>]* @h, i32 0, i32 0), i32 0, i32 %0, !dbg !26 ; line:7 col:11
-+  %2 = load i32, i32* %1, !dbg !26, !tbaa !21 ; line:7 col:11
-+  store i32 %2, i32* %b, align 4, !dbg !27, !tbaa !21 ; line:7 col:7
-+  %3 = bitcast [4 x <4 x i32>]* @h to i8*, !dbg !28 ; line:8 col:7
-+  %4 = bitcast [4 x <4 x i32>]* @g to i8*, !dbg !28 ; line:8 col:7
-+  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %3, i8* %4, i64 64, i32 1, i1 false), !dbg !28 ; line:8 col:7
-+  ret void, !dbg !29 ; line:9 col:1
-+}
-+
-+; Function Attrs: nounwind
-+declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture readonly, i64, i32, i1) #0
-+
-+attributes #0 = { nounwind }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.typeAnnotations = !{!6}
-+!dx.entryPoints = !{!10}
-+!dx.fnprops = !{!14}
-+!dx.options = !{!15, !16}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-hlemit", !"hlsl-hlensure"}
-+!2 = !{!"dxc(private) 1.8.0.4514 (d9bd2a706-dirty)"}
-+!3 = !{i32 1, i32 0}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"cs", i32 6, i32 0}
-+!6 = !{i32 1, void ()* @main, !7}
-+!7 = !{!8}
-+!8 = !{i32 1, !9, !9}
-+!9 = !{}
-+!10 = !{void ()* @main, !"main", null, !11, null}
-+!11 = !{null, null, !12, null}
-+!12 = !{!13}
-+!13 = !{i32 0, %ConstantBuffer* @"$Globals", !"$Globals", i32 0, i32 -1, i32 1, i32 0, null}
-+!14 = !{void ()* @main, i32 5, i32 1, i32 1, i32 1}
-+!15 = !{i32 64}
-+!16 = !{i32 -1}
-+!17 = !DILocation(line: 6, column: 7, scope: !18)
-+!18 = !DISubprogram(name: "main", scope: !19, file: !19, line: 5, type: !20, isLocal: false, isDefinition: true, scopeLine: 5, flags: DIFlagPrototyped, isOptimized: false, function: void ()* @main)
-+!19 = !DIFile(filename: "/mnt/c/Users/amaiorano/Downloads/342428008/standalone_reduced.hlsl", directory: "")
-+!20 = !DISubroutineType(types: !9)
-+!21 = !{!22, !22, i64 0}
-+!22 = !{!"int", !23, i64 0}
-+!23 = !{!"omnipotent char", !24, i64 0}
-+!24 = !{!"Simple C/C++ TBAA"}
-+!25 = !DILocation(line: 7, column: 16, scope: !18)
-+!26 = !DILocation(line: 7, column: 11, scope: !18)
-+!27 = !DILocation(line: 7, column: 7, scope: !18)
-+!28 = !DILocation(line: 8, column: 7, scope: !18)
-+!29 = !DILocation(line: 9, column: 1, scope: !18)

patches/DirectXShaderCompiler/cherry-pick-93c3cf1c787f.patch

@@ -1,312 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Natalie Chouinard <chouinard@google.com>
-Date: Fri, 14 Jun 2024 13:29:19 +0000
-Subject: Fix another UAF in SimplifyCFG (#6680)
-
-In certain cases of unreachable code, SimplifyCFG could try to replace a
-phi node with a select where the phi node itself was the select's
-condition. This resulted in an ASAN use-after-free during SimplifyCFG.
-
-The test case added isn't quite ideal because by the end of the
-SimplifyCFG pass, the phi node is restored to its original state both
-before and after this fix. However, an ASAN build of `dxopt` or
-`check-clang-dxc` will identify a heap-use-after-free failure in the
-intermediary steps of this test without this patch and succeeds with it.
-
-This was also fixed in upstream LLVM:
-https://github.com/llvm/llvm-project/commit/602ab248335e1540e82667e74fea44b7f042e112
-
-Bug: 344639860
-Change-Id: I743e96fb172de867c89cad51805edf96387c04ec
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5631796
-Reviewed-by: Antonio Maiorano <amaiorano@google.com>
-Reviewed-by: James Price <jrprice@google.com>
-
-diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
-index 0d3ba1e00719060c1e71fa238726f0c63bd5b32f..5b364856928af6aab007e958b24f1daea32cd733 100644
---- a/lib/Transforms/Utils/SimplifyCFG.cpp
-+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
-@@ -1830,6 +1830,14 @@ static bool FoldTwoEntryPHINode(PHINode *PN, const TargetTransformInfo &TTI,
-       isa<ConstantInt>(IfCond))
-     return false;
- 
-+  // HLSL Change Begins: Patching in llvm/llvm-project@602ab24
-+  // Don't try to fold an unreachable block. For example, the phi node itself
-+  // can't be the candidate if-condition for a select that we want to form.
-+  if (auto *IfCondPhiInst = dyn_cast<PHINode>(IfCond))
-+    if (IfCondPhiInst->getParent() == BB)
-+      return false;
-+  // HLSL Change Ends.
-+
-   // Okay, we found that we can merge this two-entry phi node into a select.
-   // Doing so would require us to fold *all* two entry phi nodes in this block.
-   // At some point this becomes non-profitable (particularly if the target
-diff --git a/tools/clang/test/DXC/Passes/SimplifyCFG/simplifycfg-uaf-phi-condition.ll b/tools/clang/test/DXC/Passes/SimplifyCFG/simplifycfg-uaf-phi-condition.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..573745a819fd1b51e3163d644088738d5128d30c
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/SimplifyCFG/simplifycfg-uaf-phi-condition.ll
-@@ -0,0 +1,263 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -simplifycfg -S | FileCheck %s
-+
-+; The IR below comes from the following HLSL.
-+; Compiling this HLSL with dxc was resulting in an ASAN use-after-free in
-+; SimplifyCFG during FoldTwoEntryPHINode because it was deleting a PHI node
-+; which was itself used as the condition for the select that replaced it.
-+
-+; struct a {
-+;   int b[2];
-+; };
-+;
-+; cbuffer cbuffer_c : register(b0) {
-+;   uint4 c[1];
-+; };
-+;
-+; void d(inout a e, inout int f) {
-+;   int n = f;
-+;   int g = asint(c[0].x);
-+;   int s = f;
-+;   bool i = (s >= 0);
-+;   int j = (s * n);
-+;   bool k = (6 > g);
-+;   int l = 0;
-+;   bool q = (s > j);
-+;   while (true) {
-+;     while (true) {
-+;       while (true) {
-+;         if (k) {
-+;           {
-+;             int t[2] = e.b;
-+;             t[g] = n;
-+;             e.b = t;
-+;           }
-+;         }
-+;         e.b[1] = g;
-+;         e.b[0] = s;
-+;         if (q) {
-+;           break;
-+;         }
-+;       }
-+;       switch(j) {
-+;         case 0: {
-+;           break;
-+;         }
-+;         case 9: {
-+;           break;
-+;         }
-+;         default: {
-+;           {
-+;             int u[2] = e.b;
-+;             u[g] = l;
-+;             e.b = u;
-+;           }
-+;           break;
-+;         }
-+;       }
-+;       {
-+;         if (q) { break; }
-+;       }
-+;     }
-+;     {
-+;       int v[2] = e.b;
-+;       v[g] = j;
-+;       e.b = v;
-+;     }
-+;     if (!(i)) {
-+;       break;
-+;     }
-+;   }
-+; }
-+;
-+; [numthreads(1, 1, 1)]
-+; void main() {
-+;   int o = 0;
-+;   a p = (a)0;
-+;   while (true) {
-+;     bool i = (o < asint(c[0].x));
-+;     if (i) {
-+;       bool r = !(i);
-+;       if (!(r)) {
-+;         return;
-+;       }
-+;       d(p, o);
-+;     }
-+;     o = (o + 1);
-+;   }
-+;   return;
-+; }
-+
-+; Make sure the phi node did not get deleted by simplifycfg
-+; CHECK:       while.body:
-+; CHECK-NEXT:    %o.0 = phi i32 [ 0, %entry ], [ %add, %if.end.6 ]
-+
-+;
-+; Buffer Definitions:
-+;
-+; cbuffer cbuffer_c
-+; {
-+;
-+;   struct cbuffer_c
-+;   {
-+;
-+;       uint4 c[1];                                   ; Offset:    0
-+;
-+;   } cbuffer_c;                                      ; Offset:    0 Size:    16
-+;
-+; }
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; cbuffer_c                         cbuffer      NA          NA     CB0            cb0     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%cbuffer_c = type { [1 x <4 x i32>] }
-+%dx.types.Handle = type { i8* }
-+%dx.types.ResourceProperties = type { i32, i32 }
-+%dx.types.CBufRet.i32 = type { i32, i32, i32, i32 }
-+%struct.a = type { [2 x i32] }
-+
-+@cbuffer_c = external constant %cbuffer_c
-+@llvm.used = appending global [1 x i8*] [i8* bitcast (%cbuffer_c* @cbuffer_c to i8*)], section "llvm.metadata"
-+
-+; Function Attrs: nounwind
-+define void @main() #0 {
-+entry:
-+  %0 = load %cbuffer_c, %cbuffer_c* @cbuffer_c, align 4
-+  %cbuffer_c8 = call %dx.types.Handle @dx.op.createHandleForLib.cbuffer_c(i32 160, %cbuffer_c %0)  ; CreateHandleForLib(Resource)
-+  %1 = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %cbuffer_c8, %dx.types.ResourceProperties { i32 13, i32 16 })  ; AnnotateHandle(res,props)  resource: CBuffer
-+  %cbuffer_c = call %dx.types.Handle @dx.op.createHandleForLib.cbuffer_c(i32 160, %cbuffer_c %0)  ; CreateHandleForLib(Resource)
-+  %2 = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %cbuffer_c, %dx.types.ResourceProperties { i32 13, i32 16 })  ; AnnotateHandle(res,props)  resource: CBuffer
-+  br label %while.body, !dbg !21 ; line:69 col:3
-+
-+while.body:                                       ; preds = %if.end.6, %entry
-+  %o.0 = phi i32 [ 0, %entry ], [ %add, %if.end.6 ]
-+  %3 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %1, i32 0), !dbg !25 ; line:70 col:25  ; CBufferLoadLegacy(handle,regIndex)
-+  %4 = extractvalue %dx.types.CBufRet.i32 %3, 0, !dbg !25 ; line:70 col:25
-+  %cmp = icmp slt i32 %o.0, %4, !dbg !26 ; line:70 col:17
-+  br i1 %cmp, label %if.then, label %if.end.6, !dbg !27 ; line:71 col:9
-+
-+if.then:                                          ; preds = %while.body
-+  br i1 %cmp, label %if.then.5, label %if.end, !dbg !28 ; line:73 col:11
-+
-+if.then.5:                                        ; preds = %if.then
-+  ret void, !dbg !29 ; line:74 col:9
-+
-+if.end:                                           ; preds = %if.then
-+  %5 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %2, i32 0), !dbg !30 ; line:11 col:17  ; CBufferLoadLegacy(handle,regIndex)
-+  %6 = extractvalue %dx.types.CBufRet.i32 %5, 0, !dbg !30 ; line:11 col:17
-+  %cmp.i = icmp sgt i32 %o.0, -1, !dbg !33 ; line:13 col:15
-+  %mul.i = mul nsw i32 %o.0, %o.0, !dbg !34 ; line:14 col:14
-+  %cmp1.i = icmp slt i32 %6, 6, !dbg !35 ; line:15 col:15
-+  %cmp4.i = icmp sgt i32 %o.0, %mul.i, !dbg !36 ; line:17 col:15
-+  br label %while.body.10.i, !dbg !37 ; line:18 col:3
-+
-+while.body.10.i:                                  ; preds = %while.end.27.i, %sw.epilog.i, %if.end.i, %if.end
-+  br i1 %cmp1.i, label %if.then.i, label %if.end.i, !dbg !38 ; line:21 col:13
-+
-+if.then.i:                                        ; preds = %while.body.10.i
-+  br label %if.end.i, !dbg !39 ; line:27 col:9
-+
-+if.end.i:                                         ; preds = %if.then.i, %while.body.10.i
-+  br i1 %cmp4.i, label %while.end.i, label %while.body.10.i, !dbg !40 ; line:30 col:13
-+
-+while.end.i:                                      ; preds = %if.end.i
-+  switch i32 %mul.i, label %sw.default.i [
-+    i32 0, label %sw.epilog.i
-+    i32 9, label %sw.epilog.i
-+  ], !dbg !41 ; line:34 col:7
-+
-+sw.default.i:                                     ; preds = %while.end.i
-+  br label %sw.epilog.i, !dbg !42 ; line:47 col:11
-+
-+sw.epilog.i:                                      ; preds = %sw.default.i, %while.end.i, %while.end.i
-+  br i1 %cmp4.i, label %while.end.27.i, label %while.body.10.i, !dbg !43 ; line:51 col:13
-+
-+while.end.27.i:                                   ; preds = %sw.epilog.i
-+  br i1 %cmp.i, label %while.body.10.i, label %if.end.6, !dbg !44 ; line:59 col:9
-+
-+if.end.6:                                         ; preds = %while.end.27.i, %while.body
-+  %add = add nsw i32 %o.0, 1, !dbg !45 ; line:78 col:12
-+  br label %while.body, !dbg !21 ; line:69 col:3
-+}
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %cbuffer_c*, i32)"(i32, %cbuffer_c*, i32) #1
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %cbuffer_c)"(i32, %dx.types.Handle, %dx.types.ResourceProperties, %cbuffer_c) #1
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32, %dx.types.Handle, i32) #2
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.Handle @dx.op.createHandleForLib.cbuffer_c(i32, %cbuffer_c) #2
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @dx.op.annotateHandle(i32, %dx.types.Handle, %dx.types.ResourceProperties) #1
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readnone }
-+attributes #2 = { nounwind readonly }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.resources = !{!6}
-+!dx.typeAnnotations = !{!9, !14}
-+!dx.entryPoints = !{!18}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-+!2 = !{!"dxc(private) 1.8.0.14620 (main, 8408ae882)"}
-+!3 = !{i32 1, i32 2}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"cs", i32 6, i32 2}
-+!6 = !{null, null, !7, null}
-+!7 = !{!8}
-+!8 = !{i32 0, %cbuffer_c* @cbuffer_c, !"cbuffer_c", i32 0, i32 0, i32 1, i32 16, null}
-+!9 = !{i32 0, %struct.a undef, !10, %cbuffer_c undef, !12}
-+!10 = !{i32 20, !11}
-+!11 = !{i32 6, !"b", i32 3, i32 0, i32 7, i32 4}
-+!12 = !{i32 16, !13}
-+!13 = !{i32 6, !"c", i32 3, i32 0, i32 7, i32 5}
-+!14 = !{i32 1, void ()* @main, !15}
-+!15 = !{!16}
-+!16 = !{i32 1, !17, !17}
-+!17 = !{}
-+!18 = !{void ()* @main, !"main", null, !6, !19}
-+!19 = !{i32 4, !20}
-+!20 = !{i32 1, i32 1, i32 1}
-+!21 = !DILocation(line: 69, column: 3, scope: !22)
-+!22 = !DISubprogram(name: "main", scope: !23, file: !23, line: 66, type: !24, isLocal: false, isDefinition: true, scopeLine: 66, flags: DIFlagPrototyped, isOptimized: false, function: void ()* @main)
-+!23 = !DIFile(filename: "/usr/local/google/home/chouinard/Downloads/standalone.hlsl", directory: "")
-+!24 = !DISubroutineType(types: !17)
-+!25 = !DILocation(line: 70, column: 25, scope: !22)
-+!26 = !DILocation(line: 70, column: 17, scope: !22)
-+!27 = !DILocation(line: 71, column: 9, scope: !22)
-+!28 = !DILocation(line: 73, column: 11, scope: !22)
-+!29 = !DILocation(line: 74, column: 9, scope: !22)
-+!30 = !DILocation(line: 11, column: 17, scope: !31, inlinedAt: !32)
-+!31 = !DISubprogram(name: "d", scope: !23, file: !23, line: 9, type: !24, isLocal: false, isDefinition: true, scopeLine: 9, flags: DIFlagPrototyped, isOptimized: false)
-+!32 = distinct !DILocation(line: 76, column: 7, scope: !22)
-+!33 = !DILocation(line: 13, column: 15, scope: !31, inlinedAt: !32)
-+!34 = !DILocation(line: 14, column: 14, scope: !31, inlinedAt: !32)
-+!35 = !DILocation(line: 15, column: 15, scope: !31, inlinedAt: !32)
-+!36 = !DILocation(line: 17, column: 15, scope: !31, inlinedAt: !32)
-+!37 = !DILocation(line: 18, column: 3, scope: !31, inlinedAt: !32)
-+!38 = !DILocation(line: 21, column: 13, scope: !31, inlinedAt: !32)
-+!39 = !DILocation(line: 27, column: 9, scope: !31, inlinedAt: !32)
-+!40 = !DILocation(line: 30, column: 13, scope: !31, inlinedAt: !32)
-+!41 = !DILocation(line: 34, column: 7, scope: !31, inlinedAt: !32)
-+!42 = !DILocation(line: 47, column: 11, scope: !31, inlinedAt: !32)
-+!43 = !DILocation(line: 51, column: 13, scope: !31, inlinedAt: !32)
-+!44 = !DILocation(line: 59, column: 9, scope: !31, inlinedAt: !32)
-+!45 = !DILocation(line: 78, column: 12, scope: !22)

patches/DirectXShaderCompiler/cherry-pick-a65e511a14b4.patch

@@ -1,66 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Wed, 3 Apr 2024 15:58:51 -0400
-Subject: Fix ASAN use-after-free on unreferenced self-assignment of struct
- instance (#6466)
-
-When deleting an unused memcpy, ScalarReplAggregatesHLSL was attempting
-to delete both the target and the source of the memcpy without first
-checking if they were both same, resulting in a double-delete.
-
-Bug: chromium:331123811
-Change-Id: Idaef95a06b10a7fb6f0ca2e662972a44ec662fbc
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5419225
-Reviewed-by: David Neto <dneto@google.com>
-Reviewed-by: dan sinclair <dsinclair@chromium.org>
-Reviewed-by: Ben Clayton <bclayton@chromium.org>
-
-diff --git a/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp b/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-index 59f32a953ac5991e38c44d685f0f8fc589377b4d..3f8ffdbcfa09a96899295fd85291cedb879a248b 100644
---- a/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-+++ b/lib/Transforms/Scalar/ScalarReplAggregatesHLSL.cpp
-@@ -1003,9 +1003,11 @@ void DeleteMemcpy(MemCpyInst *MI) {
-     if (op0->user_empty())
-       op0->eraseFromParent();
-   }
--  if (Instruction *op1 = dyn_cast<Instruction>(Op1)) {
--    if (op1->user_empty())
--      op1->eraseFromParent();
-+  if (Op0 != Op1) {
-+    if (Instruction *op1 = dyn_cast<Instruction>(Op1)) {
-+      if (op1->user_empty())
-+        op1->eraseFromParent();
-+    }
-   }
- }
- 
-diff --git a/tools/clang/test/DXC/unreferenced_struct_selft_assignment_crash.hlsl b/tools/clang/test/DXC/unreferenced_struct_selft_assignment_crash.hlsl
-new file mode 100644
-index 0000000000000000000000000000000000000000..81adf71867c9868992372e12dc1ba81aebb48344
---- /dev/null
-+++ b/tools/clang/test/DXC/unreferenced_struct_selft_assignment_crash.hlsl
-@@ -0,0 +1,24 @@
-+// RUN: %dxc -T cs_6_0 %s | FileCheck %s
-+
-+// Validate that self-assignment of a static struct instance that is not
-+// referenced does not crash the compiler. This was resulting in an ASAN
-+// use-after-free in ScalarReplAggregatesHLSL because DeleteMemcpy would
-+// attempt to delete both source and target, even if both were the same.
-+// CHECK: define void @main() {
-+// CHECK-NEXT:   ret void
-+// CHECK-NEXT: }
-+
-+struct MyStruct {
-+  int m0;
-+};
-+
-+static MyStruct s;
-+
-+void foo() {
-+  s = s;
-+}
-+
-+[numthreads(1, 1, 1)]
-+void main() {
-+  foo();
-+}

patches/DirectXShaderCompiler/cherry-pick-b3c64851765c.patch

@@ -1,231 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Thu, 20 Jun 2024 15:39:00 -0400
-Subject: Fix instcombine overflow check inserting inst at wrong place (#6679)
-
-When optimizing an overflow check of an add followed by a compare, the
-new instruction was being inserted at the compare, and the add removed.
-This produced invalid IR in cases where there were other uses of the
-former add between it and the compare. This fix makes sure to insert the
-new instruction at the old add location, rather than at the compare.
-
-Note that this was also fixed in LLVM:
-
-https://github.com/llvm/llvm-project/commit/6f5dca70ed1c030957a45ad91bd295921f17b18d
-
-Bug: chromium:342545100
-Change-Id: Iecf758e4465b32371266bbe9879790328f363322
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5644335
-Reviewed-by: dan sinclair <dsinclair@google.com>
-Reviewed-by: Ryan Harrison <rharrison@chromium.org>
-
-diff --git a/lib/Transforms/InstCombine/InstCombineCompares.cpp b/lib/Transforms/InstCombine/InstCombineCompares.cpp
-index 7274304b3de7b110a4fa3a5123ea7215d99935ef..82e7e49003e65846c84e3df2801453fb463aa23e 100644
---- a/lib/Transforms/InstCombine/InstCombineCompares.cpp
-+++ b/lib/Transforms/InstCombine/InstCombineCompares.cpp
-@@ -2145,6 +2145,12 @@ bool InstCombiner::OptimizeOverflowCheck(OverflowCheckFlavor OCF, Value *LHS,
-     return true;
-   };
- 
-+  // If the overflow check was an add followed by a compare, the insertion point
-+  // may be pointing to the compare.  We want to insert the new instructions
-+  // before the add in case there are uses of the add between the add and the
-+  // compare.
-+  Builder->SetInsertPoint(&OrigI);
-+
-   switch (OCF) {
-   case OCF_INVALID:
-     llvm_unreachable("bad overflow check kind!");
-diff --git a/tools/clang/test/DXC/Passes/InstructionCombining/instcombine-opt-overflow-check-inserts-at-add.ll b/tools/clang/test/DXC/Passes/InstructionCombining/instcombine-opt-overflow-check-inserts-at-add.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..70efa00c91c6523867980de0fb9f69c7fcfb318c
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/InstructionCombining/instcombine-opt-overflow-check-inserts-at-add.ll
-@@ -0,0 +1,187 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -instcombine,NoSink=0 -S | FileCheck %s
-+
-+; Generated from the following HLSL:
-+;   cbuffer cbuffer_g : register(b0) {
-+;     uint4 g[1];
-+;   };
-+;
-+;   [numthreads(1, 1, 1)]
-+;   void main() {
-+;     uint a = 2147483648u;
-+;     uint b = (g[0].x | 2651317025u);
-+;     uint c = (b + 2651317025u);
-+;     while (true) {
-+;       bool d = (a > c);
-+;       if (d) {
-+;         break;
-+;       } else {
-+;         while (true) {
-+;           if (!d) {
-+;             return;
-+;           }
-+;           a = b;
-+;           bool e = (d ? d : d);
-+;           if (e) {
-+;             break;
-+;           }
-+;         }
-+;       }
-+;     }
-+;   }
-+;
-+; Compiling this was resulting in invalid IR being produced from instcombine.
-+; Specifically, when optimizing an overflow check of an add followed by a compare,
-+; the new instruction was being inserted at the compare, and the add removed. This
-+; broke in cases like this one, where there were other uses of the former add between
-+; it and the compare. The fix was to make sure to insert the new instruction
-+; (another add in this case) at the old add rather than at the compare.
-+
-+; Make sure the new %add is still in the entry block before its uses.
-+; CHECK-LABEL: entry
-+; CHECK:         %add = add i32 %or, -1643650271
-+; CHECK-NEXT:    %cmp.2 = icmp sgt i32 %add, -1,
-+;
-+; Make sure the new %add is NOT in the loopexit where %cmp was optimized.
-+; CHECK-LABEL: while.body.loopexit
-+; CHECK-NEXT:    br i1 false, label %if.end.preheader, label %while.end.14
-+
-+;
-+; Buffer Definitions:
-+;
-+; cbuffer cbuffer_g
-+; {
-+;
-+;   struct cbuffer_g
-+;   {
-+;
-+;       uint4 g[1];                                   ; Offset:    0
-+;
-+;   } cbuffer_g;                                      ; Offset:    0 Size:    16
-+;
-+; }
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; cbuffer_g                         cbuffer      NA          NA     CB0            cb0     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%cbuffer_g = type { [1 x <4 x i32>] }
-+%dx.types.Handle = type { i8* }
-+%dx.types.ResourceProperties = type { i32, i32 }
-+%dx.types.CBufRet.i32 = type { i32, i32, i32, i32 }
-+
-+@cbuffer_g = external constant %cbuffer_g
-+@llvm.used = appending global [1 x i8*] [i8* bitcast (%cbuffer_g* @cbuffer_g to i8*)], section "llvm.metadata"
-+
-+; Function Attrs: nounwind
-+define void @main() #0 {
-+entry:
-+  %0 = load %cbuffer_g, %cbuffer_g* @cbuffer_g
-+  %cbuffer_g = call %dx.types.Handle @dx.op.createHandleForLib.cbuffer_g(i32 160, %cbuffer_g %0)  ; CreateHandleForLib(Resource)
-+  %1 = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %cbuffer_g, %dx.types.ResourceProperties { i32 13, i32 16 })  ; AnnotateHandle(res,props)  resource: CBuffer
-+  %2 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %1, i32 0), !dbg !19 ; line:8 col:13  ; CBufferLoadLegacy(handle,regIndex)
-+  %3 = extractvalue %dx.types.CBufRet.i32 %2, 0, !dbg !19 ; line:8 col:13
-+  %or = or i32 %3, -1643650271, !dbg !23 ; line:8 col:20
-+  %add = add i32 %or, -1643650271, !dbg !24 ; line:9 col:15
-+  %cmp.2 = icmp ugt i32 -2147483648, %add, !dbg !25 ; line:11 col:17
-+  %frombool.3 = zext i1 %cmp.2 to i32, !dbg !26 ; line:11 col:10
-+  %tobool1.4 = icmp eq i32 %frombool.3, 0, !dbg !27 ; line:12 col:9
-+  %or.cond.6 = and i1 %tobool1.4, %cmp.2, !dbg !27 ; line:12 col:9
-+  br i1 %or.cond.6, label %if.end.preheader, label %while.end.14, !dbg !27 ; line:12 col:9
-+
-+while.body.loopexit:                              ; preds = %if.end
-+  %cmp = icmp ugt i32 %or, %add, !dbg !25 ; line:11 col:17
-+  %frombool = zext i1 %cmp to i32, !dbg !26 ; line:11 col:10
-+  %tobool1 = icmp eq i32 %frombool, 0, !dbg !27 ; line:12 col:9
-+  %or.cond = and i1 %tobool1, %cmp, !dbg !27 ; line:12 col:9
-+  br i1 %or.cond, label %if.end.preheader, label %while.end.14, !dbg !27 ; line:12 col:9
-+
-+if.end.preheader:                                 ; preds = %entry, %while.body.loopexit
-+  %d.0 = phi i32 [ %frombool, %while.body.loopexit ], [ %frombool.3, %entry ]
-+  br label %if.end, !dbg !28 ; line:19 col:13
-+
-+while.body.3:                                     ; preds = %if.end
-+  %tobool4.old = icmp ne i32 %d.0, 0, !dbg !29 ; line:16 col:14
-+  br i1 %tobool4.old, label %if.end, label %while.end.14, !dbg !30 ; line:16 col:13
-+
-+if.end:                                           ; preds = %if.end.preheader, %while.body.3
-+  %tobool6 = icmp ne i32 %d.0, 0, !dbg !31 ; line:20 col:19
-+  %tobool7 = icmp ne i32 %d.0, 0, !dbg !32 ; line:20 col:23
-+  %tobool8 = icmp ne i32 %d.0, 0, !dbg !33 ; line:20 col:27
-+  %4 = select i1 %tobool6, i1 %tobool7, i1 %tobool8, !dbg !31 ; line:20 col:19
-+  br i1 %4, label %while.body.loopexit, label %while.body.3, !dbg !34 ; line:21 col:13
-+
-+while.end.14:                                     ; preds = %while.body.loopexit, %while.body.3, %entry
-+  ret void, !dbg !35 ; line:27 col:1
-+}
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %cbuffer_g*, i32)"(i32, %cbuffer_g*, i32) #1
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %cbuffer_g)"(i32, %dx.types.Handle, %dx.types.ResourceProperties, %cbuffer_g) #1
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32, %dx.types.Handle, i32) #2
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.Handle @dx.op.createHandleForLib.cbuffer_g(i32, %cbuffer_g) #2
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @dx.op.annotateHandle(i32, %dx.types.Handle, %dx.types.ResourceProperties) #1
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readnone }
-+attributes #2 = { nounwind readonly }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.resources = !{!6}
-+!dx.typeAnnotations = !{!9, !12}
-+!dx.entryPoints = !{!16}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-+!2 = !{!"dxc(private) 1.8.0.4514 (d9bd2a706-dirty)"}
-+!3 = !{i32 1, i32 0}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"cs", i32 6, i32 0}
-+!6 = !{null, null, !7, null}
-+!7 = !{!8}
-+!8 = !{i32 0, %cbuffer_g* @cbuffer_g, !"cbuffer_g", i32 0, i32 0, i32 1, i32 16, null}
-+!9 = !{i32 0, %cbuffer_g undef, !10}
-+!10 = !{i32 16, !11}
-+!11 = !{i32 6, !"g", i32 3, i32 0, i32 7, i32 5}
-+!12 = !{i32 1, void ()* @main, !13}
-+!13 = !{!14}
-+!14 = !{i32 1, !15, !15}
-+!15 = !{}
-+!16 = !{void ()* @main, !"main", null, !6, !17}
-+!17 = !{i32 4, !18}
-+!18 = !{i32 1, i32 1, i32 1}
-+!19 = !DILocation(line: 8, column: 13, scope: !20)
-+!20 = !DISubprogram(name: "main", scope: !21, file: !21, line: 6, type: !22, isLocal: false, isDefinition: true, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: false, function: void ()* @main)
-+!21 = !DIFile(filename: "/mnt/c/Users/amaiorano/Downloads/342545100/standalone_reduced.hlsl", directory: "")
-+!22 = !DISubroutineType(types: !15)
-+!23 = !DILocation(line: 8, column: 20, scope: !20)
-+!24 = !DILocation(line: 9, column: 15, scope: !20)
-+!25 = !DILocation(line: 11, column: 17, scope: !20)
-+!26 = !DILocation(line: 11, column: 10, scope: !20)
-+!27 = !DILocation(line: 12, column: 9, scope: !20)
-+!28 = !DILocation(line: 19, column: 13, scope: !20)
-+!29 = !DILocation(line: 16, column: 14, scope: !20)
-+!30 = !DILocation(line: 16, column: 13, scope: !20)
-+!31 = !DILocation(line: 20, column: 19, scope: !20)
-+!32 = !DILocation(line: 20, column: 23, scope: !20)
-+!33 = !DILocation(line: 20, column: 27, scope: !20)
-+!34 = !DILocation(line: 21, column: 13, scope: !20)
-+!35 = !DILocation(line: 27, column: 1, scope: !20)

patches/DirectXShaderCompiler/cherry-pick-b845fed99111.patch

@@ -1,294 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Natalie Chouinard <chouinard@google.com>
-Date: Mon, 10 Jun 2024 18:21:40 +0000
-Subject: Fix LoopDeletion incorrectly updating PHI with multiple duplicate
- inputs (#6643)
-
-LoopDeletion was incorrectly updating PHI nodes in the target block when
-it had duplicate input edges. This happens, for example, when deleting a
-loop that uses a switch with multiple cases that exit the same way.
-
-After determining that this was the bug, I found this fix in LLVM:
-https://reviews.llvm.org/D34516 and applied it here.
-
-Bug: 340196361
-Change-Id: I98b150bb9a164466eb84dd3d46f720d5d92ef909
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5616791
-Reviewed-by: Antonio Maiorano <amaiorano@google.com>
-Reviewed-by: dan sinclair <dsinclair@chromium.org>
-
-diff --git a/lib/Transforms/Scalar/LoopDeletion.cpp b/lib/Transforms/Scalar/LoopDeletion.cpp
-index 6c2c1d60548f5a8a7939fee70728e8a34572b648..6cd1fba7c085b6d61dcb23b073358fc4c798e099 100644
---- a/lib/Transforms/Scalar/LoopDeletion.cpp
-+++ b/lib/Transforms/Scalar/LoopDeletion.cpp
-@@ -195,15 +195,29 @@ bool LoopDeletion::runOnLoop(Loop *L, LPPassManager &LPM) {
- 
-   // Rewrite phis in the exit block to get their inputs from
-   // the preheader instead of the exiting block.
--  BasicBlock *exitingBlock = exitingBlocks[0];
-   BasicBlock::iterator BI = exitBlock->begin();
-   while (PHINode *P = dyn_cast<PHINode>(BI)) {
--    int j = P->getBasicBlockIndex(exitingBlock);
--    assert(j >= 0 && "Can't find exiting block in exit block's phi node!");
--    P->setIncomingBlock(j, preheader);
--    for (unsigned i = 1; i < exitingBlocks.size(); ++i)
--      P->removeIncomingValue(exitingBlocks[i]);
-+    // HLSL Change begin - apply https://reviews.llvm.org/D34516
-+    // Set the zero'th element of Phi to be from the preheader and remove all
-+    // other incoming values. Given the loop has dedicated exits, all other
-+    // incoming values must be from the exiting blocks.
-+    int PredIndex = 0;
-+    P->setIncomingBlock(PredIndex, preheader);
-+    // Removes all incoming values from all other exiting blocks (including
-+    // duplicate values from an exiting block).
-+    // Nuke all entries except the zero'th entry which is the preheader entry.
-+    // NOTE! We need to remove Incoming Values in the reverse order as done
-+    // below, to keep the indices valid for deletion (removeIncomingValues
-+    // updates getNumIncomingValues and shifts all values down into the operand
-+    // being deleted).
-+    for (unsigned i = 0, e = P->getNumIncomingValues() - 1; i != e; ++i)
-+      P->removeIncomingValue(e - i, false);
-+
-+    assert((P->getNumIncomingValues() == 1 &&
-+            P->getIncomingBlock(PredIndex) == preheader) &&
-+           "Should have exactly one value and that's from the preheader!");
-     ++BI;
-+    // HLSL Change end
-   }
- 
-   // Update the dominator tree and remove the instructions and blocks that will
-diff --git a/tools/clang/test/DXC/Passes/DxilLoopDeletion/dxil-loop-deletion-phi-with-duplicate-preds.ll b/tools/clang/test/DXC/Passes/DxilLoopDeletion/dxil-loop-deletion-phi-with-duplicate-preds.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..62736bf2934a5db67ee75386431498f49e101f49
---- /dev/null
-+++ b/tools/clang/test/DXC/Passes/DxilLoopDeletion/dxil-loop-deletion-phi-with-duplicate-preds.ll
-@@ -0,0 +1,229 @@
-+; RUN: %dxopt %s -hlsl-passes-resume -dxil-loop-deletion,NoSink=0 -S | FileCheck %s
-+
-+; This test was generated from the following HLSL:
-+;
-+;  cbuffer cbuffer_g : register(b0) {
-+;    uint4 gu4[1];
-+;  };
-+;
-+;  float4 f() {
-+;    float4 r = float4(0.0f, 0.0f, 0.0f, 0.0f);
-+;    int i = 0;
-+;    int j = 0;
-+;    while (true) {
-+;      float a = asfloat(gu4[0].y);
-+;      int ai = int(a);
-+;      bool b = (j < ai);
-+;      if (j >= ai) {
-+;        break;
-+;      }
-+;      bool c = (i > 0);
-+;      if (c) {
-+;        break;
-+;      } else {
-+;        bool3 b3 = bool3(b.xxx);
-+;        if (b3[i]) {
-+;          switch(i) {
-+;            case 0: return r;
-+;            case -1: return r;
-+;          }
-+;          if (c) {
-+;            break;
-+;          }
-+;        } else {
-+;          r = float4(0.0f, 0.0f, 0.0f, a);
-+;        }
-+;      }
-+;      i = j;
-+;      j = (j + 1);
-+;    }
-+;    r = (0.0f).xxxx;
-+;    return r;
-+;  }
-+;
-+;  struct return_val {
-+;    float4 value : SV_Target0;
-+;  };
-+;
-+;  return_val main() {
-+;    float4 inner_result = f();
-+;    return_val wrapper_result = (return_val)0;
-+;    wrapper_result.value = inner_result;
-+;    return wrapper_result;
-+;  }
-+;
-+; When compiling the above with dxc, ASAN reported a use-after-free in simplifycfg,
-+; which originated from a delete during the dxil-loop-deletion pass. This was due
-+; to a bug in LoopDeletion::runOnLoop that did not properly handle updated PHIs
-+; with duplicate input preds. After this test runs, the loop should be deleted,
-+; and the program optimized to simply write out 0s to the cbuffer.
-+
-+; CHECK: define void @main
-+; CHECK-NEXT: entry:
-+; CHECK-NEXT:  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float 0.000000e+00)
-+; CHECK-NEXT:  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float 0.000000e+00)
-+; CHECK-NEXT:  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float 0.000000e+00)
-+; CHECK-NEXT:  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float 0.000000e+00)
-+; CHECK-NEXT:  ret void
-+
-+;
-+; Output signature:
-+;
-+; Name                 Index             InterpMode DynIdx
-+; -------------------- ----- ---------------------- ------
-+; SV_Target                0
-+;
-+; Buffer Definitions:
-+;
-+; cbuffer cbuffer_g
-+; {
-+;
-+;   struct cbuffer_g
-+;   {
-+;
-+;       uint4 gu4[1];                                 ; Offset:    0
-+;
-+;   } cbuffer_g;                                      ; Offset:    0 Size:    16
-+;
-+; }
-+;
-+;
-+; Resource Bindings:
-+;
-+; Name                                 Type  Format         Dim      ID      HLSL Bind  Count
-+; ------------------------------ ---------- ------- ----------- ------- -------------- ------
-+; cbuffer_g                         cbuffer      NA          NA     CB0            cb0     1
-+;
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+%cbuffer_g = type { [1 x <4 x i32>] }
-+%dx.types.Handle = type { i8* }
-+%dx.types.ResourceProperties = type { i32, i32 }
-+%dx.types.CBufRet.i32 = type { i32, i32, i32, i32 }
-+%struct.return_val = type { <4 x float> }
-+
-+@cbuffer_g = external constant %cbuffer_g
-+@.hca = internal unnamed_addr constant [3 x i32] [i32 1, i32 1, i32 1]
-+@llvm.used = appending global [1 x i8*] [i8* bitcast (%cbuffer_g* @cbuffer_g to i8*)], section "llvm.metadata"
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.createhandle..%dx.types.Handle (i32, %cbuffer_g*, i32)"(i32, %cbuffer_g*, i32) #0
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @"dx.hl.annotatehandle..%dx.types.Handle (i32, %dx.types.Handle, %dx.types.ResourceProperties, %cbuffer_g)"(i32, %dx.types.Handle, %dx.types.ResourceProperties, %cbuffer_g) #0
-+
-+; Function Attrs: nounwind
-+define void @main(<4 x float>* noalias nocapture readnone) #1 {
-+entry:
-+  %1 = load %cbuffer_g, %cbuffer_g* @cbuffer_g, align 4, !dbg !25 ; line:45 col:25
-+  %cbuffer_g = call %dx.types.Handle @dx.op.createHandleForLib.cbuffer_g(i32 160, %cbuffer_g %1), !dbg !25 ; line:45 col:25  ; CreateHandleForLib(Resource)
-+  %2 = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %cbuffer_g, %dx.types.ResourceProperties { i32 13, i32 16 }), !dbg !25 ; line:45 col:25  ; AnnotateHandle(res,props)  resource: CBuffer
-+  %3 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %2, i32 0), !dbg !29 ; line:10 col:23  ; CBufferLoadLegacy(handle,regIndex)
-+  %4 = extractvalue %dx.types.CBufRet.i32 %3, 1, !dbg !29 ; line:10 col:23
-+  %5 = bitcast i32 %4 to float, !dbg !32 ; line:10 col:15
-+  %conv.i.6 = fptosi float %5 to i32, !dbg !33 ; line:11 col:18
-+  %cmp1.i.8 = icmp sgt i32 %conv.i.6, 0, !dbg !34 ; line:13 col:11
-+  br i1 %cmp1.i.8, label %if.end.i, label %"\01?f@@YA?AV?$vector@M$03@@XZ.exit", !dbg !35 ; line:13 col:9
-+
-+if.end.i:                                         ; preds = %entry, %if.end.19.i
-+  %6 = phi float [ %9, %if.end.19.i ], [ %5, %entry ]
-+  %j.i.011 = phi i32 [ %add.i, %if.end.19.i ], [ 0, %entry ]
-+  %r.i.0.i310 = phi float [ %r.i.0.i310, %if.end.19.i ], [ 0.000000e+00, %entry ]
-+  %i.i.09 = phi i32 [ %j.i.011, %if.end.19.i ], [ 0, %entry ]
-+  %cmp4.i = icmp sgt i32 %i.i.09, 0, !dbg !36 ; line:16 col:17
-+  br i1 %cmp4.i, label %"\01?f@@YA?AV?$vector@M$03@@XZ.exit", label %if.then.12.i, !dbg !37 ; line:17 col:9
-+
-+if.then.12.i:                                     ; preds = %if.end.i
-+  switch i32 %i.i.09, label %if.end.19.i [
-+    i32 0, label %"\01?f@@YA?AV?$vector@M$03@@XZ.exit"
-+    i32 -1, label %"\01?f@@YA?AV?$vector@M$03@@XZ.exit"
-+  ], !dbg !38 ; line:22 col:9
-+
-+if.end.19.i:                                      ; preds = %if.then.12.i
-+  %add.i = add nuw nsw i32 %j.i.011, 1, !dbg !39 ; line:34 col:12
-+  %7 = call %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32 59, %dx.types.Handle %2, i32 0), !dbg !29 ; line:10 col:23  ; CBufferLoadLegacy(handle,regIndex)
-+  %8 = extractvalue %dx.types.CBufRet.i32 %7, 1, !dbg !29 ; line:10 col:23
-+  %9 = bitcast i32 %8 to float, !dbg !32 ; line:10 col:15
-+  %conv.i = fptosi float %9 to i32, !dbg !33 ; line:11 col:18
-+  %cmp.i = icmp slt i32 %add.i, %conv.i, !dbg !40 ; line:12 col:17
-+  br i1 %cmp.i, label %if.end.i, label %"\01?f@@YA?AV?$vector@M$03@@XZ.exit", !dbg !35 ; line:13 col:9
-+
-+"\01?f@@YA?AV?$vector@M$03@@XZ.exit":             ; preds = %if.then.12.i, %if.then.12.i, %if.end.i, %if.end.19.i, %entry
-+  %retval.i.0.i3 = phi float [ 0.000000e+00, %entry ], [ %r.i.0.i310, %if.then.12.i ], [ %r.i.0.i310, %if.then.12.i ], [ 0.000000e+00, %if.end.i ], [ 0.000000e+00, %if.end.19.i ]
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 0, float 0.000000e+00), !dbg !41 ; line:48 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 1, float 0.000000e+00), !dbg !41 ; line:48 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 2, float 0.000000e+00), !dbg !41 ; line:48 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  call void @dx.op.storeOutput.f32(i32 5, i32 0, i32 0, i8 3, float %retval.i.0.i3), !dbg !41 ; line:48 col:10  ; StoreOutput(outputSigId,rowIndex,colIndex,value)
-+  ret void, !dbg !42 ; line:48 col:3
-+}
-+
-+; Function Attrs: nounwind
-+declare void @dx.op.storeOutput.f32(i32, i32, i32, i8, float) #1
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.CBufRet.i32 @dx.op.cbufferLoadLegacy.i32(i32, %dx.types.Handle, i32) #2
-+
-+; Function Attrs: nounwind readonly
-+declare %dx.types.Handle @dx.op.createHandleForLib.cbuffer_g(i32, %cbuffer_g) #2
-+
-+; Function Attrs: nounwind readnone
-+declare %dx.types.Handle @dx.op.annotateHandle(i32, %dx.types.Handle, %dx.types.ResourceProperties) #0
-+
-+attributes #0 = { nounwind readnone }
-+attributes #1 = { nounwind }
-+attributes #2 = { nounwind readonly }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+!dx.version = !{!3}
-+!dx.valver = !{!4}
-+!dx.shaderModel = !{!5}
-+!dx.resources = !{!6}
-+!dx.typeAnnotations = !{!9, !14}
-+!dx.entryPoints = !{!21}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-+!2 = !{!"dxc(private) 1.8.0.4514 (d9bd2a706-dirty)"}
-+!3 = !{i32 1, i32 5}
-+!4 = !{i32 1, i32 8}
-+!5 = !{!"ps", i32 6, i32 5}
-+!6 = !{null, null, !7, null}
-+!7 = !{!8}
-+!8 = !{i32 0, %cbuffer_g* @cbuffer_g, !"cbuffer_g", i32 0, i32 0, i32 1, i32 16, null}
-+!9 = !{i32 0, %struct.return_val undef, !10, %cbuffer_g undef, !12}
-+!10 = !{i32 16, !11}
-+!11 = !{i32 6, !"value", i32 3, i32 0, i32 4, !"SV_Target0", i32 7, i32 9}
-+!12 = !{i32 16, !13}
-+!13 = !{i32 6, !"gu4", i32 3, i32 0, i32 7, i32 5}
-+!14 = !{i32 1, void (<4 x float>*)* @main, !15}
-+!15 = !{!16, !18}
-+!16 = !{i32 0, !17, !17}
-+!17 = !{}
-+!18 = !{i32 1, !19, !20}
-+!19 = !{i32 4, !"SV_Target0", i32 7, i32 9}
-+!20 = !{i32 0}
-+!21 = !{void (<4 x float>*)* @main, !"main", !22, !6, null}
-+!22 = !{null, !23, null}
-+!23 = !{!24}
-+!24 = !{i32 0, !"SV_Target", i8 9, i8 16, !20, i8 0, i32 1, i8 4, i32 0, i8 0, null}
-+!25 = !DILocation(line: 45, column: 25, scope: !26)
-+!26 = !DISubprogram(name: "main", scope: !27, file: !27, line: 44, type: !28, isLocal: false, isDefinition: true, scopeLine: 44, flags: DIFlagPrototyped, isOptimized: false, function: void (<4 x float>*)* @main)
-+!27 = !DIFile(filename: "/mnt/c/Users/amaiorano/Downloads/340196361/standalone_reduced.hlsl", directory: "")
-+!28 = !DISubroutineType(types: !17)
-+!29 = !DILocation(line: 10, column: 23, scope: !30, inlinedAt: !31)
-+!30 = !DISubprogram(name: "f", scope: !27, file: !27, line: 5, type: !28, isLocal: false, isDefinition: true, scopeLine: 5, flags: DIFlagPrototyped, isOptimized: false)
-+!31 = distinct !DILocation(line: 45, column: 25, scope: !26)
-+!32 = !DILocation(line: 10, column: 15, scope: !30, inlinedAt: !31)
-+!33 = !DILocation(line: 11, column: 18, scope: !30, inlinedAt: !31)
-+!34 = !DILocation(line: 13, column: 11, scope: !30, inlinedAt: !31)
-+!35 = !DILocation(line: 13, column: 9, scope: !30, inlinedAt: !31)
-+!36 = !DILocation(line: 16, column: 17, scope: !30, inlinedAt: !31)
-+!37 = !DILocation(line: 17, column: 9, scope: !30, inlinedAt: !31)
-+!38 = !DILocation(line: 22, column: 9, scope: !30, inlinedAt: !31)
-+!39 = !DILocation(line: 34, column: 12, scope: !30, inlinedAt: !31)
-+!40 = !DILocation(line: 12, column: 17, scope: !30, inlinedAt: !31)
-+!41 = !DILocation(line: 48, column: 10, scope: !26)
-+!42 = !DILocation(line: 48, column: 3, scope: !26)

patches/DirectXShaderCompiler/cherry-pick-bc18aec94c82.patch

@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Thu, 18 Apr 2024 13:07:04 -0400
-Subject: Replace dynamic_cast with virtual call (#6515)
-
-Make TextDiagnosticPrinter::setPrefix a virtual function in base class
-DiagnosticConsumer. This allows us to avoid using dynamic_cast in
-BackendConsumer::DxilDiagHandler, required for codebases that do not
-enable RTTI. This is also the only place in the codebase that uses RTTI
-(AFAICT).
-
-Bug: chromium:333420620
-Change-Id: Ida73077f24fdb4b705b5d868b04ac6cfecb30327
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5464347
-Reviewed-by: dan sinclair <dsinclair@chromium.org>
-Reviewed-by: David Neto <dneto@google.com>
-
-diff --git a/tools/clang/include/clang/Basic/Diagnostic.h b/tools/clang/include/clang/Basic/Diagnostic.h
-index dc9f781c093c0bc8f6da773d514ac6d1503f842d..0b98dffb94185e242320409d43b74dae2c2a908d 100644
---- a/tools/clang/include/clang/Basic/Diagnostic.h
-+++ b/tools/clang/include/clang/Basic/Diagnostic.h
-@@ -1395,6 +1395,8 @@ public:
-   /// warnings and errors.
-   virtual void HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
-                                 const Diagnostic &Info);
-+
-+  virtual void setPrefix(std::string Value) {} // HLSL Change
- };
- 
- /// \brief A diagnostic client that ignores all diagnostics.
-diff --git a/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h b/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
-index 04a570559fe06a0670ef8a7e6e94c40aa37e55a9..936031e09673a09c6e1164c515efce02ac51b910 100644
---- a/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
-+++ b/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h
-@@ -45,7 +45,8 @@ public:
-   /// setPrefix - Set the diagnostic printer prefix string, which will be
-   /// printed at the start of any diagnostics. If empty, no prefix string is
-   /// used.
--  void setPrefix(std::string Value) { Prefix = Value; }
-+  // HLSL Change: add override
-+  void setPrefix(std::string Value) override { Prefix = Value; }
- 
-   void BeginSourceFile(const LangOptions &LO, const Preprocessor *PP) override;
-   void EndSourceFile() override;
-diff --git a/tools/clang/lib/CodeGen/CodeGenAction.cpp b/tools/clang/lib/CodeGen/CodeGenAction.cpp
-index 4fa721e812296356e31fc1bf6ea35ce295c2592c..68ebaadf5a8960c8def189248412136fe9543422 100644
---- a/tools/clang/lib/CodeGen/CodeGenAction.cpp
-+++ b/tools/clang/lib/CodeGen/CodeGenAction.cpp
-@@ -557,7 +557,7 @@ BackendConsumer::DxilDiagHandler(const llvm::DiagnosticInfoDxil &D) {
- 
-   // If no location information is available, add function name
-   if (Loc.isInvalid()) {
--    auto *DiagClient = dynamic_cast<TextDiagnosticPrinter*>(Diags.getClient());
-+    auto *DiagClient = Diags.getClient();
-     auto *func = D.getFunction();
-     if (DiagClient && func)
-       DiagClient->setPrefix("Function: " + func->getName().str());

patches/DirectXShaderCompiler/cherry-pick-bd7aa9779873.patch

@@ -1,161 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Antonio Maiorano <amaiorano@google.com>
-Date: Thu, 25 Apr 2024 16:49:11 -0400
-Subject: Fixed crash in loop unroll caused by bug in structurize loop exits
- (#6548)
-
-Fixed a bug in `hlsl::RemoveUnstructuredLoopExits` where when a new
-exiting block is created from splitting, it was added to the current
-loop being processed, when it could also part of an inner loop. Not
-adding the new block to inner loops that it's part of makes the inner
-loops malformed, and causes crash.
-
-This fix adds the new block to the inner most loop that it should be
-part of. Also adds the `StructurizeLoopExits` option to `loop-unroll`
-pass, which was missing before.
-
-Bug: chromium:333508731
-Change-Id: I7efc21bc61aeb81b4906a600c35272af232710ea
-Reviewed-on: https://chromium-review.googlesource.com/c/external/github.com/microsoft/DirectXShaderCompiler/+/5490380
-Reviewed-by: James Price <jrprice@google.com>
-Reviewed-by: Ben Clayton <bclayton@chromium.org>
-
-diff --git a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
-index b6a07d6b27a23ee3831e84cee82299d6d405a288..ef6718f0f22ee33e3f16f9801a64c1a6fb6c653a 100644
---- a/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
-+++ b/lib/Transforms/Scalar/DxilRemoveUnstructuredLoopExits.cpp
-@@ -447,7 +447,12 @@ static bool RemoveUnstructuredLoopExitsIteration(BasicBlock *exiting_block,
-       new_exiting_block->splitBasicBlock(new_exiting_block->getFirstNonPHI());
-   new_exiting_block->setName("dx.struct_exit.new_exiting");
-   new_not_exiting_block->setName(old_name);
--  L->addBasicBlockToLoop(new_not_exiting_block, *LI);
-+  // Query for new_exiting_block's own loop to add new_not_exiting_block to.
-+  // It's possible that new_exiting_block is part of another inner loop
-+  // separate from L. If added directly to L, the inner loop(s) will not
-+  // contain new_not_exiting_block, making them malformed.
-+  Loop *inner_loop_of_exiting_block = LI->getLoopFor(new_exiting_block);
-+  inner_loop_of_exiting_block->addBasicBlockToLoop(new_not_exiting_block, *LI);
- 
-   // Branch to latch_exit
-   new_exiting_block->getTerminator()->eraseFromParent();
-diff --git a/lib/Transforms/Scalar/LoopUnrollPass.cpp b/lib/Transforms/Scalar/LoopUnrollPass.cpp
-index dd520f7e57d25311be7f3773849a00efaabe6717..b17a5a4a0bc368f16020c4153370ea2c92e5c26c 100644
---- a/lib/Transforms/Scalar/LoopUnrollPass.cpp
-+++ b/lib/Transforms/Scalar/LoopUnrollPass.cpp
-@@ -155,6 +155,18 @@ namespace {
-     bool UserAllowPartial;
-     bool UserRuntime;
- 
-+    // HLSL Change - begin
-+    // Function overrides that resolve options when used for DxOpt
-+    void applyOptions(PassOptions O) override {
-+      GetPassOptionBool(O, "StructurizeLoopExits", &StructurizeLoopExits,
-+                        false);
-+    }
-+    void dumpConfig(raw_ostream &OS) override {
-+      LoopPass::dumpConfig(OS);
-+      OS << ",StructurizeLoopExits=" << StructurizeLoopExits;
-+    }
-+    // HLSL Change - end
-+
-     bool runOnLoop(Loop *L, LPPassManager &LPM) override;
- 
-     /// This transformation requires natural loop information & requires that
-diff --git a/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll b/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll
-new file mode 100644
-index 0000000000000000000000000000000000000000..743135541cd8faec287164ba3b321a59432832b6
---- /dev/null
-+++ b/tools/clang/test/DXC/loop_structurize_exit_inner_latch_regression.ll
-@@ -0,0 +1,75 @@
-+; RUN: %dxopt %s -S -loop-unroll,StructurizeLoopExits=1 | FileCheck %s
-+; RUN: %dxopt %s -S -dxil-loop-unroll,StructurizeLoopExits=1 | FileCheck %s
-+
-+; CHECK: mul nsw i32
-+; CHECK: mul nsw i32
-+; CHECK-NOT: mul nsw i32
-+
-+; This is a regression test for a crash in loop unroll. When there are multiple
-+; exits, the compiler will run hlsl::RemoveUnstructuredLoopExits to try to
-+; avoid unstructured code.
-+;
-+; In this test, the compiler will try to unroll the middle loop. The exit edge
-+; from %land.lhs.true to %if.then will be removed, and %if.end will be split at
-+; the beginning, and branch to %if.end instead.
-+;
-+; Since the new split block at %if.end becomes the new latch of the inner-most
-+; loop, it needs to be added to the Loop analysis structure of the inner loop.
-+; However, it was only added to the current middle loop that is being unrolled.
-+
-+target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
-+target triple = "dxil-ms-dx"
-+
-+; Function Attrs: nounwind
-+define void @main(i32 *%arg0, i32 *%arg1, i32 *%arg2) #0 {
-+entry:
-+  br label %while.body.3.preheader.lr.ph
-+
-+while.body.3.preheader.lr.ph.loopexit:            ; preds = %for.inc
-+  br label %while.body.3.preheader.lr.ph
-+
-+while.body.3.preheader.lr.ph:                     ; preds = %while.body.3.preheader.lr.ph.loopexit, %entry
-+  br label %while.body.3.preheader
-+
-+while.body.3.preheader:                           ; preds = %while.body.3.preheader.lr.ph, %for.inc
-+  %i.0 = phi i32 [ 0, %while.body.3.preheader.lr.ph ], [ %inc, %for.inc ]
-+  br label %while.body.3
-+
-+while.body.3:                                     ; preds = %while.body.3.preheader, %if.end
-+  %load_arg0 = load i32, i32* %arg0
-+  %cmp4 = icmp sgt i32 %load_arg0, 0
-+  br i1 %cmp4, label %land.lhs.true, label %if.end
-+
-+land.lhs.true:                                    ; preds = %while.body.3
-+  %load_arg1 = load i32, i32* %arg1
-+  %load_arg2 = load i32, i32* %arg2
-+  %mul = mul nsw i32 %load_arg2, %load_arg1
-+  %cmp7 = icmp eq i32 %mul, 10
-+  br i1 %cmp7, label %if.then, label %if.end
-+
-+if.then:                                          ; preds = %land.lhs.true
-+  ret void
-+
-+if.end:                                           ; preds = %land.lhs.true, %while.body.3
-+  %cmp10 = icmp sle i32 %i.0, 4
-+  br i1 %cmp10, label %for.inc, label %while.body.3
-+
-+for.inc:                                          ; preds = %if.end
-+  %inc = add nsw i32 %i.0, 1
-+  %cmp = icmp slt i32 %inc, 2
-+  br i1 %cmp, label %while.body.3.preheader, label %while.body.3.preheader.lr.ph.loopexit, !llvm.loop !3
-+}
-+
-+attributes #0 = { nounwind }
-+attributes #1 = { nounwind readnone }
-+attributes #2 = { nounwind readonly }
-+
-+!llvm.module.flags = !{!0}
-+!pauseresume = !{!1}
-+!llvm.ident = !{!2}
-+
-+!0 = !{i32 2, !"Debug Info Version", i32 3}
-+!1 = !{!"hlsl-dxilemit", !"hlsl-dxilload"}
-+!2 = !{!"dxc(private) 1.8.0.14563 (main, 07ce88034-dirty)"}
-+!3 = distinct !{!3, !4}
-+!4 = !{!"llvm.loop.unroll.full"}
-diff --git a/utils/hct/hctdb.py b/utils/hct/hctdb.py
-index 77f5671016eb66a4ddf8a943ec8cb05e8d87c9cd..ca8d16bd2562e26e8572413499d32dc2232de5c0 100644
---- a/utils/hct/hctdb.py
-+++ b/utils/hct/hctdb.py
-@@ -6680,6 +6680,12 @@ class db_dxil(object):
-                     "t": "unsigned",
-                     "d": "Unrolled size limit for loops with an unroll(full) or unroll_count pragma.",
-                 },
-+                {
-+                    "n": "StructurizeLoopExits",
-+                    "t": "bool",
-+                    "c": 1,
-+                    "d": "Whether the unroller should try to structurize loop exits first.",
-+                },
-             ],
-         )
-         add_pass("mldst-motion", "MergedLoadStoreMotion", "MergedLoadStoreMotion", [])

patches/angle/.patches

@@ -1,6 +0,0 @@
-m123_vulkan_fix_access_to_inactive_attributes.patch
-cherry-pick-f6672dbbe223.patch
-cherry-pick-ba3b4e239620.patch
-cherry-pick-c67f290ef0f0.patch
-cherry-pick-bda89e1f7c71.patch
-m126_vulkan_disable_vk_ext_shader_stencil_export_on_swiftshader.patch

patches/angle/cherry-pick-ba3b4e239620.patch

@@ -1,249 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Mon, 8 Apr 2024 10:14:45 -0400
-Subject: M123: SPIR-V: Fix const constructors with single scalar
-
-These constructors may be generated because of
-RemoveArrayLengthTraverser.
-
-Bug: chromium:332546345
-Change-Id: I2b2bf3728ef5bae148abc2a8518f8f3f42850025
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5462388
-(cherry picked from commit 0b776d32f69a932acb61963d9daad9e13f610944)
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5473406
-Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
-Reviewed-by: Geoff Lang <geofflang@chromium.org>
-Reviewed-by: Daniel Gagnon <dgagnon@google.com>
-
-diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
-index eddc5e724e8e949aff0624c6caf9aadec7c14647..57a71c5d13fbf5e458c26b084e1f9834edb37f58 100644
---- a/src/compiler/translator/Compiler.cpp
-+++ b/src/compiler/translator/Compiler.cpp
-@@ -1056,6 +1056,11 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
-     {
-         return false;
-     }
-+    // Fold the expressions again, because |RemoveArrayLengthMethod| can introduce new constants.
-+    if (!FoldExpressions(this, root, &mDiagnostics))
-+    {
-+        return false;
-+    }
- 
-     if (!RemoveUnreferencedVariables(this, root, &mSymbolTable))
-     {
-diff --git a/src/compiler/translator/spirv/OutputSPIRV.cpp b/src/compiler/translator/spirv/OutputSPIRV.cpp
-index caa8f956716abf53aaeb58a5f654f5a4f04c4d6a..67b1fdd4784660483a408f1ee27ce48b05ffcb0a 100644
---- a/src/compiler/translator/spirv/OutputSPIRV.cpp
-+++ b/src/compiler/translator/spirv/OutputSPIRV.cpp
-@@ -1335,6 +1335,8 @@ spirv::IdRef OutputSPIRVTraverser::createComplexConstant(const TType &type,
- 
-     if (type.isMatrix() && !type.isArray())
-     {
-+        ASSERT(parameters.size() == type.getRows() * type.getCols());
-+
-         // Matrices are constructed from their columns.
-         spirv::IdRefList columnIds;
- 
-diff --git a/src/tests/gl_tests/GLSLTest.cpp b/src/tests/gl_tests/GLSLTest.cpp
-index cfe6414d52647db92669be954cadd15344603559..a4035db329548491c91e2f7383f837001540c065 100644
---- a/src/tests/gl_tests/GLSLTest.cpp
-+++ b/src/tests/gl_tests/GLSLTest.cpp
-@@ -8486,6 +8486,198 @@ void main()
-     EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
- }
- 
-+// Test that array length inside vector constructor works.
-+TEST_P(GLSLTest_ES3, ArrayLengthInVectorConstructor)
-+{
-+    const char kVS[] = R"(#version 300 es
-+precision highp float;
-+flat out uvec4 v;
-+
-+int[1] f0()
-+{
-+    return int[1](1);
-+}
-+void main()
-+{
-+    v = uvec4(vec4(f0().length()));
-+
-+    gl_Position.x = ((gl_VertexID & 1) == 0 ? -1.0 : 1.0);
-+    gl_Position.y = ((gl_VertexID & 2) == 0 ? -1.0 : 1.0);
-+    gl_Position.zw = vec2(0, 1);
-+})";
-+
-+    const char kFS[] = R"(#version 300 es
-+precision highp float;
-+flat in uvec4 v;
-+out vec4 color;
-+
-+bool isEq(uint a, float b) { return abs(float(a) - b) < 0.01; }
-+
-+void main()
-+{
-+    if (isEq(v[0], 1.) &&
-+        isEq(v[1], 1.) &&
-+        isEq(v[2], 1.) &&
-+        isEq(v[3], 1.))
-+    {
-+        color = vec4(0, 1, 0, 1);
-+    }
-+    else
-+    {
-+        color = vec4(1, 0, 0, 1);
-+    }
-+})";
-+
-+    ANGLE_GL_PROGRAM(program, kVS, kFS);
-+    glUseProgram(program);
-+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
-+}
-+
-+// Test that array length inside vector constructor works in complex expression.
-+TEST_P(GLSLTest_ES3, ArrayLengthInVectorConstructorComplex)
-+{
-+    const char kVS[] = R"(#version 300 es
-+precision highp float;
-+out vec4 v;
-+
-+int[1] f0()
-+{
-+    return int[1](1);
-+}
-+void main()
-+{
-+    v = vec4(float(uint(f0().length()) + 1u) / 4.);
-+
-+    gl_Position.x = ((gl_VertexID & 1) == 0 ? -1.0 : 1.0);
-+    gl_Position.y = ((gl_VertexID & 2) == 0 ? -1.0 : 1.0);
-+    gl_Position.zw = vec2(0, 1);
-+})";
-+
-+    const char kFS[] = R"(#version 300 es
-+precision highp float;
-+in vec4 v;
-+out vec4 color;
-+
-+bool isEq(float a, float b) { return abs(float(a) - b) < 0.01; }
-+
-+void main()
-+{
-+    if (isEq(v[0], 0.5) &&
-+        isEq(v[1], 0.5) &&
-+        isEq(v[2], 0.5) &&
-+        isEq(v[3], 0.5))
-+    {
-+        color = vec4(0, 1, 0, 1);
-+    }
-+    else
-+    {
-+        color = vec4(1, 0, 0, 1);
-+    }
-+})";
-+
-+    ANGLE_GL_PROGRAM(program, kVS, kFS);
-+    glUseProgram(program);
-+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
-+}
-+
-+// Test that array length inside matrix constructor works.
-+TEST_P(GLSLTest_ES3, ArrayLengthInMatrixConstructor)
-+{
-+    const char kVS[] = R"(#version 300 es
-+precision highp float;
-+out mat2x2 v;
-+
-+int[1] f0()
-+{
-+    return int[1](1);
-+}
-+void main()
-+{
-+    v = mat2x2(f0().length());
-+
-+    gl_Position.x = ((gl_VertexID & 1) == 0 ? -1.0 : 1.0);
-+    gl_Position.y = ((gl_VertexID & 2) == 0 ? -1.0 : 1.0);
-+    gl_Position.zw = vec2(0, 1);
-+})";
-+
-+    const char kFS[] = R"(#version 300 es
-+precision highp float;
-+in mat2x2 v;
-+out vec4 color;
-+
-+bool isEq(float a, float b) { return abs(a - b) < 0.01; }
-+
-+void main()
-+{
-+    if (isEq(v[0][0], 1.) &&
-+        isEq(v[0][1], 0.) &&
-+        isEq(v[1][0], 0.) &&
-+        isEq(v[1][1], 1.))
-+    {
-+        color = vec4(0, 1, 0, 1);
-+    }
-+    else
-+    {
-+        color = vec4(1, 0, 0, 1);
-+    }
-+})";
-+
-+    ANGLE_GL_PROGRAM(program, kVS, kFS);
-+    glUseProgram(program);
-+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
-+}
-+
-+// Test that array length inside vector constructor inside matrix constructor works.
-+TEST_P(GLSLTest_ES3, ArrayLengthInVectorInMatrixConstructor)
-+{
-+    const char kVS[] = R"(#version 300 es
-+precision highp float;
-+out mat2x2 v;
-+
-+int[1] f0()
-+{
-+    return int[1](1);
-+}
-+void main()
-+{
-+    v = mat2x2(vec2(f0().length()), f0().length(), 0);
-+
-+    gl_Position.x = ((gl_VertexID & 1) == 0 ? -1.0 : 1.0);
-+    gl_Position.y = ((gl_VertexID & 2) == 0 ? -1.0 : 1.0);
-+    gl_Position.zw = vec2(0, 1);
-+})";
-+
-+    const char kFS[] = R"(#version 300 es
-+precision highp float;
-+in mat2x2 v;
-+out vec4 color;
-+
-+bool isEq(float a, float b) { return abs(a - b) < 0.01; }
-+
-+void main()
-+{
-+    if (isEq(v[0][0], 1.) &&
-+        isEq(v[0][1], 1.) &&
-+        isEq(v[1][0], 1.) &&
-+        isEq(v[1][1], 0.))
-+    {
-+        color = vec4(0, 1, 0, 1);
-+    }
-+    else
-+    {
-+        color = vec4(1, 0, 0, 1);
-+    }
-+})";
-+
-+    ANGLE_GL_PROGRAM(program, kVS, kFS);
-+    glUseProgram(program);
-+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
-+}
-+
- // Test that statements inside switch() get translated to correct HLSL.
- TEST_P(GLSLTest_ES3, DifferentStatementsInsideSwitch)
- {

patches/angle/cherry-pick-bda89e1f7c71.patch

@@ -1,74 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Thu, 2 May 2024 11:17:33 -0400
-Subject: M124: Vulkan: Turn SPIR-V limitations to crash instead of security
- bug
-
-The input shader can be made complex in a number of different ways,
-resulting in instructions with a length higher than what can fit in
-SPIR-V (i.e. 16 bits).  Ideally, the translator would catch such complex
-usage early on and gracefully fail compilation.  However, as a safety
-net, this change makes sure such a case is detected when the SPIR-V
-instruction is being generated and turned into a crash.  This makes sure
-such bugs are no longer security bugs.
-
-Bug: chromium:335613092
-Change-Id: Iab16b49ed80929fc343b4c7bffce306919de2e96
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5547611
-Reviewed-by: Roman Lavrov <romanl@google.com>
-
-diff --git a/scripts/code_generation_hashes/SPIR-V_helpers.json b/scripts/code_generation_hashes/SPIR-V_helpers.json
-index cb1b596b6d02f35e2817cac53ace42d64e33bffd..944cf1a2cbd34a0e28e7cfad4b874344f662512b 100644
---- a/scripts/code_generation_hashes/SPIR-V_helpers.json
-+++ b/scripts/code_generation_hashes/SPIR-V_helpers.json
-@@ -1,8 +1,8 @@
- {
-   "src/common/spirv/gen_spirv_builder_and_parser.py":
--    "e95670a30a4eda80a146b61c986fb03c",
-+    "868a697edbc38c95e36be54cf5c71435",
-   "src/common/spirv/spirv_instruction_builder_autogen.cpp":
--    "1b5f60a24d459e7a30c29cf7acfa2106",
-+    "c149de371bcd571bd31cc8eb1e517910",
-   "src/common/spirv/spirv_instruction_builder_autogen.h":
-     "56b1309d8afabb2b64d7e16f0c4a4898",
-   "src/common/spirv/spirv_instruction_parser_autogen.cpp":
-diff --git a/src/common/spirv/gen_spirv_builder_and_parser.py b/src/common/spirv/gen_spirv_builder_and_parser.py
-index 5e8e9bc4e8914cf2173a8fa720446f6647dd065e..c7e1f401b380f3b4fe0bd6b9178b42ee5ac41250 100755
---- a/src/common/spirv/gen_spirv_builder_and_parser.py
-+++ b/src/common/spirv/gen_spirv_builder_and_parser.py
-@@ -93,6 +93,15 @@ uint32_t MakeLengthOp(size_t length, spv::Op op)
-     ASSERT(length <= 0xFFFFu);
-     ASSERT(op <= 0xFFFFu);
- 
-+    // It's easy for a complex shader to be crafted to hit the length limit,
-+    // turn that into a crash instead of a security bug.  Ideally, the compiler
-+    // would gracefully fail compilation, so this is more of a safety net.
-+    if (ANGLE_UNLIKELY(length > 0xFFFFu))
-+    {
-+        ERR() << "Complex shader not representible in SPIR-V";
-+        ANGLE_CRASH();
-+    }
-+
-     return static_cast<uint32_t>(length) << 16 | op;
- }
- }  // anonymous namespace
-diff --git a/src/common/spirv/spirv_instruction_builder_autogen.cpp b/src/common/spirv/spirv_instruction_builder_autogen.cpp
-index 3c73c58e3c0141f3e00a61eab784d3e3b96dff8e..6e6ad6f510cb76588f61dacee8dbcac5a544d8d1 100644
---- a/src/common/spirv/spirv_instruction_builder_autogen.cpp
-+++ b/src/common/spirv/spirv_instruction_builder_autogen.cpp
-@@ -25,6 +25,15 @@ uint32_t MakeLengthOp(size_t length, spv::Op op)
-     ASSERT(length <= 0xFFFFu);
-     ASSERT(op <= 0xFFFFu);
- 
-+    // It's easy for a complex shader to be crafted to hit the length limit,
-+    // turn that into a crash instead of a security bug.  Ideally, the compiler
-+    // would gracefully fail compilation, so this is more of a safety net.
-+    if (ANGLE_UNLIKELY(length > 0xFFFFu))
-+    {
-+        ERR() << "Complex shader not representible in SPIR-V";
-+        ANGLE_CRASH();
-+    }
-+
-     return static_cast<uint32_t>(length) << 16 | op;
- }
- }  // anonymous namespace

patches/angle/cherry-pick-c67f290ef0f0.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Geoff Lang <geofflang@chromium.org>
-Date: Mon, 29 Apr 2024 15:27:36 -0400
-Subject: M124: GL: Sync unpack state for glCompressedTexSubImage3D
-
-Unpack state is supposed to be ignored for compressed tex image calls
-but some drivers use it anyways and read incorrect data.
-
-Texture3DTestES3.PixelUnpackStateTexSubImage covers this case.
-
-Bug: chromium:337766133
-Change-Id: Ic11a056113b1850bd5b4d6840527164a12849a22
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5498735
-Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
-Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
-(cherry picked from commit 1bb1ee061fe0bce322fb93b447a72e72c993a1f2)
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5518811
-Commit-Queue: Srinivas Sista <srinivassista@chromium.org>
-Reviewed-by: Srinivas Sista <srinivassista@chromium.org>
-
-diff --git a/src/libANGLE/renderer/gl/TextureGL.cpp b/src/libANGLE/renderer/gl/TextureGL.cpp
-index c659aacb9e48d7eab033f0ea59d3514f557a430b..f96eefe53f11a8a57fc88998c2ba22a2dacf1d65 100644
---- a/src/libANGLE/renderer/gl/TextureGL.cpp
-+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
-@@ -664,6 +664,7 @@ angle::Result TextureGL::setCompressedSubImage(const gl::Context *context,
-         nativegl::GetCompressedSubTexImageFormat(functions, features, format);
- 
-     stateManager->bindTexture(getType(), mTextureID);
-+    ANGLE_TRY(stateManager->setPixelUnpackState(context, unpack));
-     if (nativegl::UseTexImage2D(getType()))
-     {
-         ASSERT(area.z == 0 && area.depth == 1);

patches/angle/cherry-pick-f6672dbbe223.patch

@@ -1,267 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Mon, 25 Mar 2024 14:46:56 -0400
-Subject: M123: Translator: Disallow samplers in structs in interface blocks
-
-As disallowed by the spec:
-
-> Types and declarators are the same as for other uniform variable
-> declarations outside blocks, with these exceptions:
->
-> * opaque types are not allowed
-
-Bug: chromium:328859176
-Change-Id: Ib94977860102329e520e635c3757827c93ca2163
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5391986
-Auto-Submit: Shahbaz Youssefi <syoussefi@chromium.org>
-Reviewed-by: Geoff Lang <geofflang@chromium.org>
-Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
-(cherry picked from commit a0fa06f6d79ced897c0fe2795551268199d29806)
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5435737
-Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
-
-diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
-index 38bd4ca13a4a8828ebbe64e19bd740639bce5083..98b4dc46fec65269a87ee920d8e63a1d0350fbae 100644
---- a/src/compiler/translator/ParseContext.cpp
-+++ b/src/compiler/translator/ParseContext.cpp
-@@ -34,27 +34,39 @@ namespace
- 
- const int kWebGLMaxStructNesting = 4;
- 
--bool ContainsSampler(const TStructure *structType);
-+struct IsSamplerFunc
-+{
-+    bool operator()(TBasicType type) { return IsSampler(type); }
-+};
-+struct IsOpaqueFunc
-+{
-+    bool operator()(TBasicType type) { return IsOpaqueType(type); }
-+};
-+
-+template <typename OpaqueFunc>
-+bool ContainsOpaque(const TStructure *structType);
- 
--bool ContainsSampler(const TType &type)
-+template <typename OpaqueFunc>
-+bool ContainsOpaque(const TType &type)
- {
--    if (IsSampler(type.getBasicType()))
-+    if (OpaqueFunc{}(type.getBasicType()))
-     {
-         return true;
-     }
-     if (type.getBasicType() == EbtStruct)
-     {
--        return ContainsSampler(type.getStruct());
-+        return ContainsOpaque<OpaqueFunc>(type.getStruct());
-     }
- 
-     return false;
- }
- 
--bool ContainsSampler(const TStructure *structType)
-+template <typename OpaqueFunc>
-+bool ContainsOpaque(const TStructure *structType)
- {
-     for (const auto &field : structType->fields())
-     {
--        if (ContainsSampler(*field->type()))
-+        if (ContainsOpaque<OpaqueFunc>(*field->type()))
-             return true;
-     }
-     return false;
-@@ -1113,7 +1125,7 @@ bool TParseContext::checkIsNotOpaqueType(const TSourceLoc &line,
- {
-     if (pType.type == EbtStruct)
-     {
--        if (ContainsSampler(pType.userDef))
-+        if (ContainsOpaque<IsSamplerFunc>(pType.userDef))
-         {
-             std::stringstream reasonStream = sh::InitializeStream<std::stringstream>();
-             reasonStream << reason << " (structure contains a sampler)";
-@@ -4979,12 +4991,9 @@ TIntermDeclaration *TParseContext::addInterfaceBlock(
-     {
-         TField *field    = (*fieldList)[memberIndex];
-         TType *fieldType = field->type();
--        if (IsOpaqueType(fieldType->getBasicType()))
-+        if (ContainsOpaque<IsOpaqueFunc>(*fieldType))
-         {
--            std::string reason("unsupported type - ");
--            reason += fieldType->getBasicString();
--            reason += " types are not allowed in interface blocks";
--            error(field->line(), reason.c_str(), fieldType->getBasicString());
-+            error(field->line(), "Opaque types are not allowed in interface blocks", blockName);
-         }
- 
-         const TQualifier qualifier = fieldType->getQualifier();
-diff --git a/src/tests/gl_tests/GLSLTest.cpp b/src/tests/gl_tests/GLSLTest.cpp
-index ed63153e49b2425a974a497a1fae2f9fdc79afa6..cfe6414d52647db92669be954cadd15344603559 100644
---- a/src/tests/gl_tests/GLSLTest.cpp
-+++ b/src/tests/gl_tests/GLSLTest.cpp
-@@ -6716,7 +6716,34 @@ void main()
-     gl_FragColor = vec4(f(us), 0, 0, 1);
- })";
- 
--    CompileShader(GL_FRAGMENT_SHADER, kFS);
-+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
-+    EXPECT_NE(fs, 0u);
-+    ASSERT_GL_NO_ERROR();
-+}
-+
-+// Test that structs with samplers are not allowed in interface blocks.  This is forbidden per
-+// GLES3:
-+//
-+// > Types and declarators are the same as for other uniform variable declarations outside blocks,
-+// > with these exceptions:
-+// > * opaque types are not allowed
-+TEST_P(GLSLTest_ES3, StructWithSamplersDisallowedInInterfaceBlock)
-+{
-+    const char kFS[] = R"(#version 300 es
-+precision mediump float;
-+struct S { sampler2D samp; bool b; };
-+
-+layout(std140) uniform Buffer { S s; } buffer;
-+
-+out vec4 color;
-+
-+void main()
-+{
-+    color = texture(buffer.s.samp, vec2(0));
-+})";
-+
-+    GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
-+    EXPECT_EQ(fs, 0u);
-     ASSERT_GL_NO_ERROR();
- }
- 
-@@ -18357,6 +18384,116 @@ void main() {
-     EXPECT_EQ(0u, shader);
- }
- 
-+// Same as TooManyFieldsInStruct, but with samplers in the struct.
-+TEST_P(GLSLTest_ES3, TooManySamplerFieldsInStruct)
-+{
-+    std::ostringstream fs;
-+    fs << R"(#version 300 es
-+precision highp float;
-+struct TooManyFields
-+{
-+)";
-+    for (uint32_t i = 0; i < (1 << 16); ++i)
-+    {
-+        fs << "    sampler2D field" << i << ";\n";
-+    }
-+    fs << R"(};
-+uniform TooManyFields s;
-+out vec4 color;
-+void main() {
-+    color = texture(s.field0, vec2(0));
-+})";
-+
-+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, fs.str().c_str());
-+    EXPECT_EQ(0u, shader);
-+}
-+
-+// More complex variation of ManySamplerFieldsInStruct.  This one compiles fine.
-+TEST_P(GLSLTest_ES3, ManySamplerFieldsInStructComplex)
-+{
-+    // D3D and OpenGL may be more restrictive about this many samplers.
-+    ANGLE_SKIP_TEST_IF(IsD3D() || IsOpenGL());
-+
-+    std::ostringstream fs;
-+    fs << R"(#version 300 es
-+precision highp float;
-+
-+struct X {
-+    mediump sampler2D a[0xf00];
-+    mediump sampler2D b[0xf00];
-+    mediump sampler2D c[0xf000];
-+    mediump sampler2D d[0xf00];
-+};
-+
-+struct Y {
-+  X s1;
-+  mediump sampler2D a[0xf00];
-+  mediump sampler2D b[0xf000];
-+  mediump sampler2D c[0x14000];
-+};
-+
-+struct S {
-+    Y s1;
-+};
-+
-+struct structBuffer { S s; };
-+
-+uniform structBuffer b;
-+
-+out vec4 color;
-+void main()
-+{
-+    color = texture(b.s.s1.s1.c[0], vec2(0));
-+})";
-+
-+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, fs.str().c_str());
-+    EXPECT_NE(0u, shader);
-+}
-+
-+// Make sure a large array of samplers works.
-+TEST_P(GLSLTest, ManySamplers)
-+{
-+    // D3D and OpenGL may be more restrictive about this many samplers.
-+    ANGLE_SKIP_TEST_IF(IsD3D() || IsOpenGL());
-+
-+    std::ostringstream fs;
-+    fs << R"(precision highp float;
-+
-+uniform mediump sampler2D c[0x12000];
-+
-+void main()
-+{
-+    gl_FragColor = texture2D(c[0], vec2(0));
-+})";
-+
-+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, fs.str().c_str());
-+    EXPECT_NE(0u, shader);
-+}
-+
-+// Make sure a large array of samplers works when declared in a struct.
-+TEST_P(GLSLTest, ManySamplersInStruct)
-+{
-+    // D3D and OpenGL may be more restrictive about this many samplers.
-+    ANGLE_SKIP_TEST_IF(IsD3D() || IsOpenGL());
-+
-+    std::ostringstream fs;
-+    fs << R"(precision highp float;
-+
-+struct X {
-+    mediump sampler2D c[0x12000];
-+};
-+
-+uniform X x;
-+
-+void main()
-+{
-+    gl_FragColor = texture2D(x.c[0], vec2(0));
-+})";
-+
-+    GLuint shader = CompileShader(GL_FRAGMENT_SHADER, fs.str().c_str());
-+    EXPECT_NE(0u, shader);
-+}
-+
- // Test that passing large arrays to functions are compiled correctly.  Regression test for the
- // SPIR-V generator that made a copy of the array to pass to the function, by decomposing and
- // reconstructing it (in the absence of OpCopyLogical), but the reconstruction instruction has a
-diff --git a/src/tests/gl_tests/PixelLocalStorageTest.cpp b/src/tests/gl_tests/PixelLocalStorageTest.cpp
-index c49ba5741ad565ad9637fb2188a472ccbebc6284..126936271eb25eec601349a560fabc6f0f7d4b75 100644
---- a/src/tests/gl_tests/PixelLocalStorageTest.cpp
-+++ b/src/tests/gl_tests/PixelLocalStorageTest.cpp
-@@ -5573,8 +5573,7 @@ TEST_P(PixelLocalStorageCompilerTest, Declarations)
-     EXPECT_FALSE(log.compileFragmentShader(kPLSInStruct));
-     EXPECT_TRUE(log.has("ERROR: 0:5: 'pixelLocalANGLE' : disallowed type in struct"));
-     EXPECT_TRUE(
--        log.has("ERROR: 0:10: 'pixelLocalANGLE' : unsupported type - pixelLocalANGLE types are not "
--                "allowed in interface blocks"));
-+        log.has("ERROR: 0:10: 'PLSBlock' : Opaque types are not allowed in interface blocks"));
- 
-     ASSERT_GL_NO_ERROR();
- }

patches/angle/m123_vulkan_fix_access_to_inactive_attributes.patch

@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Geoff Lang <geofflang@chromium.org>
-Date: Tue, 12 Mar 2024 16:06:37 -0400
-Subject: M123: Vulkan: Fix access to inactive attributes
-
-... within range of active ones.  Since a buffer is bound for inactive
-attributes, it must be considered accessed.
-
-Ultimately, the nullDescriptor feature could be used to avoid binding a
-buffer for inactive attributes.
-
-Bug: chromium:327807820
-Change-Id: I953b419d8ec51760e8848409024cad5083888fa2
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5386431
-Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
-
-diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
-index 63bfa0729b266ceca54e10153f561f74a1be0c27..a0cbaf8cefbae1453922e09aadcd13df6f478782 100644
---- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
-@@ -2610,8 +2610,7 @@ angle::Result ContextVk::handleDirtyGraphicsVertexBuffers(DirtyBits::Iterator *d
-         vertexArrayVk->getCurrentArrayBuffers();
- 
-     // Mark all active vertex buffers as accessed.
--    const gl::AttributesMask attribsMask = executable->getActiveAttribLocationsMask();
--    for (size_t attribIndex : attribsMask)
-+    for (uint32_t attribIndex = 0; attribIndex < maxAttrib; ++attribIndex)
-     {
-         vk::BufferHelper *arrayBuffer = arrayBufferResources[attribIndex];
-         if (arrayBuffer)
-diff --git a/src/tests/gl_tests/VertexAttributeTest.cpp b/src/tests/gl_tests/VertexAttributeTest.cpp
-index b8a1c87728b3ba54a32cf0e4da6ca626c05d1d92..773bbf026821795c0db34239d27fd2bb1e5a751a 100644
---- a/src/tests/gl_tests/VertexAttributeTest.cpp
-+++ b/src/tests/gl_tests/VertexAttributeTest.cpp
-@@ -1256,6 +1256,19 @@ class VertexAttributeOORTest : public VertexAttributeTest
-     }
- };
- 
-+class RobustVertexAttributeTest : public VertexAttributeTest
-+{
-+  public:
-+    RobustVertexAttributeTest()
-+    {
-+        // mac GL and metal do not support robustness.
-+        if (!IsMac() && !IsIOS())
-+        {
-+            setRobustAccess(true);
-+        }
-+    }
-+};
-+
- // Verify that drawing with a large out-of-range offset generates INVALID_OPERATION.
- // Requires WebGL compatibility with robust access behaviour disabled.
- TEST_P(VertexAttributeOORTest, ANGLEDrawArraysBufferTooSmall)
-@@ -1316,6 +1329,48 @@ TEST_P(VertexAttributeOORTest, ANGLEDrawArraysOutOfBoundsCases)
-     EXPECT_GL_ERROR(GL_INVALID_OPERATION);
- }
- 
-+// Test that enabling a buffer in an unused attribute doesn't crash.  There should be an active
-+// attribute after that.
-+TEST_P(RobustVertexAttributeTest, BoundButUnusedBuffer)
-+{
-+    constexpr char kVS[] = R"(attribute vec2 offset;
-+void main()
-+{
-+    gl_Position = vec4(offset.xy, 0, 1);
-+    gl_PointSize = 1.0;
-+})";
-+
-+    constexpr char kFS[] = R"(precision mediump float;
-+void main()
-+{
-+    gl_FragColor = vec4(1.0, 0, 0, 1.0);
-+})";
-+
-+    const GLuint vs = CompileShader(GL_VERTEX_SHADER, kVS);
-+    const GLuint fs = CompileShader(GL_FRAGMENT_SHADER, kFS);
-+
-+    GLuint program = glCreateProgram();
-+    glBindAttribLocation(program, 1, "offset");
-+    glAttachShader(program, vs);
-+    glAttachShader(program, fs);
-+    glLinkProgram(program);
-+
-+    GLBuffer buffer;
-+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
-+    glBufferData(GL_ARRAY_BUFFER, 100, nullptr, GL_STATIC_DRAW);
-+
-+    // Enable an unused attribute that is within the range of active attributes (not beyond it)
-+    glEnableVertexAttribArray(0);
-+    glVertexAttribPointer(0, 4, GL_FLOAT, false, 0, 0);
-+
-+    glUseProgram(program);
-+    glDrawArrays(GL_TRIANGLES, 0, 6);
-+
-+    // Destroy the buffer.  Regression test for a tracking bug where the buffer was used by
-+    // SwiftShader (even though location 1 is inactive), but not marked as used by ANGLE.
-+    buffer.reset();
-+}
-+
- // Verify that using a different start vertex doesn't mess up the draw.
- TEST_P(VertexAttributeTest, DrawArraysWithBufferOffset)
- {
-@@ -4913,6 +4968,8 @@ ANGLE_INSTANTIATE_TEST_ES2_AND_ES3_AND(
-     ES3_METAL().disable(Feature::HasExplicitMemBarrier).disable(Feature::HasCheapRenderPass),
-     ES3_METAL().disable(Feature::HasExplicitMemBarrier).enable(Feature::HasCheapRenderPass));
- 
-+ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(RobustVertexAttributeTest);
-+
- GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VertexAttributeTestES3);
- ANGLE_INSTANTIATE_TEST_ES3_AND(
-     VertexAttributeTestES3,

patches/angle/m126_vulkan_disable_vk_ext_shader_stencil_export_on_swiftshader.patch

@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Thu, 13 Jun 2024 16:54:03 -0400
-Subject: M126: Vulkan: Disable VK_EXT_shader_stencil_export on SwiftShader
-
-Bug: chromium:40942995
-Change-Id: I5035d9b11997a1c7c839d7d62544fecca9fd1f73
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5634418
-Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
-
-diff --git a/src/libANGLE/renderer/vulkan/RendererVk.cpp b/src/libANGLE/renderer/vulkan/RendererVk.cpp
-index 25beb6a346798f117b8fe15de9858adcc32881cd..4827c61a166633d191e1f9b03a3dc47066ce9522 100644
---- a/src/libANGLE/renderer/vulkan/RendererVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/RendererVk.cpp
-@@ -4175,9 +4175,11 @@ void RendererVk::initFeatures(DisplayVk *displayVk,
-     }
- #endif  // defined(ANGLE_PLATFORM_ANDROID) || defined(ANGLE_PLATFORM_LINUX)
- 
-+    // Disabled on SwiftShader due to http://crbug.com/40942995
-     ANGLE_FEATURE_CONDITION(
-         &mFeatures, supportsShaderStencilExport,
--        ExtensionFound(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME, deviceExtensionNames));
-+        ExtensionFound(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME, deviceExtensionNames) &&
-+            !isSwiftShader);
- 
-     ANGLE_FEATURE_CONDITION(
-         &mFeatures, supportsRenderPassLoadStoreOpNone,

patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch

@@ -20,7 +20,7 @@ index 2ca14efae5ea478f43794a81883b00dfdb1a37b0..d73055fbf39334925ef4b4804bbaca57
  
      case ssl_open_record_error:
 diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-index 58b68e6759650b9a2a3915aa343451bdd1ec1e89..a709ab4067a001ce1087f89c3b5d66e99ba0d4f7 100644
+index 98f97ebb28a06dfde00082922a1aff24f8aa154c..8ec11f0e839760ace90bd88e096ffbd17508e224 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
 @@ -1334,7 +1334,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {
@@ -32,7 +32,7 @@ index 58b68e6759650b9a2a3915aa343451bdd1ec1e89..a709ab4067a001ce1087f89c3b5d66e9
        return SSL_ERROR_ZERO_RETURN;
      }
      // An EOF was observed which violates the protocol, and the underlying
-@@ -2705,13 +2705,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
+@@ -2701,13 +2701,7 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ctx, int idx) {
    return CRYPTO_get_ex_data(&ctx->ex_data, idx);
  }