pull upstream resolve conflicts

Author: AnastaZIuk

.github/workflows/clang-format-checker.yml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - name: Fetch LLVM sources
+      - name: Fetch DirectXShaderCompiler sources
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
@@ -31,6 +31,20 @@ jobs:
           separator: ","
           skip_initial_fetch: true
 
+      # We need to pull the script from the main branch, so that we ensure
+      # we get the latest version of this script.
+      - name: Fetch code formatting utils
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: microsoft/DirectXShaderCompiler
+          ref: ${{ github.base_ref }}
+          sparse-checkout: |
+            utils/git/requirements_formatting.txt
+            utils/git/code-format-helper.py
+            utils/git/code-format-save-diff.py
+          sparse-checkout-cone-mode: false
+          path: code-format-tools
+
       - name: "Listed files"
         env:
           LISTED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
@@ -48,10 +62,10 @@ jobs:
         with:
           python-version: '3.11'
           cache: 'pip'
-          cache-dependency-path: 'utils/git/requirements_formatting.txt'
+          cache-dependency-path: 'code-format-tools/utils/git/requirements_formatting.txt'
 
       - name: Install python dependencies
-        run: pip install -r utils/git/requirements_formatting.txt
+        run: pip install -r code-format-tools/utils/git/requirements_formatting.txt
 
       - name: Run code formatter
         id: formatter
@@ -61,7 +75,7 @@ jobs:
           END_REV: ${{ github.event.pull_request.head.sha }}
           CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
         run: |
-           python utils/git/code-format-helper.py \
+           python code-format-tools/utils/git/code-format-helper.py \
             --token ${{ secrets.GITHUB_TOKEN }} \
             --issue-number $GITHUB_PR_NUMBER \
             --start-rev $START_REV \
@@ -92,28 +106,37 @@ jobs:
             } catch (err) {
               core.setFailed(`Request failed with error ${err}`)
             } 
-      - name: Fetch LLVM sources
-        uses: actions/checkout@v4
+      
+      # We need to pull the script from the main branch, so that we ensure
+      # we get the latest version of this script.
+      - name: Fetch code formatting utils
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          fetch-depth: 2
-          path: build/main_src
+          repository: microsoft/DirectXShaderCompiler
+          ref: ${{ github.base_ref }}
+          sparse-checkout: |
+            utils/git/requirements_formatting.txt
+            utils/git/code-format-helper.py
+            utils/git/code-format-save-diff.py
+          sparse-checkout-cone-mode: false
+          path: code-format-tools
 
       - name: Setup Python env
         uses: actions/setup-python@v4
         with:
           python-version: '3.11'
           cache: 'pip'
-          cache-dependency-path: 'build/main_src/utils/git/requirements_formatting.txt'
+          cache-dependency-path: 'code-format-tools/utils/git/requirements_formatting.txt'
 
       - name: Install python dependencies
-        run: pip install -r build/main_src/utils/git/requirements_formatting.txt
+        run: pip install -r code-format-tools/utils/git/requirements_formatting.txt
 
       - name: Apply code diff
         env:
           GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
           COMMENT_ID: ${{ github.event.comment.id }}
         run: |
-          python build/main_src/utils/git/code-format-save-diff.py \
+          python code-format-tools/utils/git/code-format-save-diff.py \
             --token ${{ secrets.GITHUB_TOKEN }} \
             --issue-number $GITHUB_PR_NUMBER \
             --tmp-diff-file $TMP_DIFF_FILE \

autoconf/config.guess

@@ -929,6 +929,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    loongarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;

azure-pipelines.yml

@@ -52,17 +52,17 @@ stages:
 
     variables:
       macOS: macOS-latest
-      linux: Ubuntu-latest
+      linux: Ubuntu-22.04 # FIXME: #7364, DXC does not build correctly with GCC 13+
 
     strategy:
       matrix:
-        Linux_Clang_Release:
+        Linux_Clang_RelWithDebInfo:
           image: ${{ variables.linux }}
-          configuration: Release
+          configuration: RelWithDebInfo
           CC: clang-18
           CXX: clang++-18
-          CMAKE_OPTS: -DLLVM_ENABLE_WERROR=On -DLLVM_USE_SANITIZER='Address;Undefined' -DLLVM_ENABLE_LIBCXX=On -DLLVM_USE_LINKER=lld
-          CHECK_ALL_ENV: ASAN_OPTIONS=alloc_dealloc_mismatch=0
+          CMAKE_OPTS: -DLLVM_ENABLE_WERROR=On -DLLVM_USE_SANITIZER='Address;Undefined' -DLLVM_ENABLE_LIBCXX=On -DLLVM_USE_LINKER=lld-18
+          CHECK_ALL_ENV: ASAN_OPTIONS=alloc_dealloc_mismatch=0 LSAN_OPTIONS=suppressions=$BUILD_SOURCESDIRECTORY/utils/asan/x86_64-pc-linux-gnu.lsan.supp:print_suppressions=0 ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-18 LSAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-18
           OS: Linux
         Linux_Clang_Debug:
           image: ${{ variables.linux }}
@@ -107,6 +107,8 @@ stages:
         versionSpec: '3.x'
 
     - bash: |
+        sudo apt-get update
+        sudo apt-get upgrade libc6 libc6-dbg
         sudo apt-get install ninja-build
         wget https://apt.llvm.org/llvm.sh
         chmod u+x llvm.sh

cmake/config-ix.cmake

@@ -367,6 +367,8 @@ elseif (LLVM_NATIVE_ARCH MATCHES "wasm64")
   set(LLVM_NATIVE_ARCH WebAssembly)
 elseif (LLVM_NATIVE_ARCH MATCHES "riscv64")
   set(LLVM_NATIVE_ARCH RISCV)
+elseif (LLVM_NATIVE_ARCH MATCHES "loongarch64")
+  set(LLVM_NATIVE_ARCH LoongArch)
 elseif (LLVM_NATIVE_ARCH MATCHES "e2k")
   set(LLVM_NATIVE_ARCH E2K)
 else ()

cmake/modules/HandleLLVMOptions.cmake

@@ -301,7 +301,6 @@ if( MSVC )
 
   set(msvc_warning_flags
     # Disabled warnings.
-    -wd4146 # Suppress 'unary minus operator applied to unsigned type, result still unsigned'
     -wd4180 # Suppress 'qualifier applied to function type has no meaning; ignored'
     -wd4244 # Suppress ''argument' : conversion from 'type1' to 'type2', possible loss of data'
     -wd4258 # Suppress ''var' : definition from the for loop is ignored; the definition from the enclosing scope is used'