From ffd0b644330255b481c11a6cd5d259c033bcf405 Mon Sep 17 00:00:00 2001
From: Butkovits Atila <abutkovits@mozilla.com>
Date: Tue, 20 Sep 2022 01:05:02 +0300
Subject: [PATCH] Backed out changeset 90cbd3e4faac (bug 1784202) for causing
 clang-format failures.

---
 build/build-clang/clang-15.json              |  15 -
 taskcluster/ci/fetch/toolchains.yml          |   7 -
 taskcluster/ci/toolchain/clang-tidy.yml      |  10 +-
 taskcluster/ci/toolchain/clang.yml           | 457 ++++++++-----------
 taskcluster/ci/toolchain/compiler-rt.yml     | 164 +++----
 taskcluster/ci/toolchain/llvm-symbolizer.yml |  16 +-
 taskcluster/ci/toolchain/sysroot.yml         |   8 +-
 taskcluster/ci/webrender/kind.yml            |   2 +-
 8 files changed, 296 insertions(+), 383 deletions(-)
 delete mode 100644 build/build-clang/clang-15.json

diff --git a/build/build-clang/clang-15.json b/build/build-clang/clang-15.json
deleted file mode 100644
index 6d1bcc3be886..000000000000
--- a/build/build-clang/clang-15.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "patches": [
-        "find_symbolizer_linux_clang_15.patch",
-        "android-mangling-error_clang_12.patch",
-        "unpoison-thread-stacks_clang_10.patch",
-        "downgrade-mangling-error_clang_12.patch",
-        "bug47258-extract-symbols-mbcs.patch",
-        "fuzzing_ccov_build_clang_12.patch",
-        "win64-no-symlink_clang_16.patch",
-        "revert-llvmorg-15-init-13446-g7524fe962e47.patch",
-        "revert-llvmorg-14-init-14141-gd6d3000a2f6d.patch",
-        "revert-llvmorg-14-init-11890-gf86deb18cab6.patch",
-        "win64-ret-null-on-commitment-limit_clang_14.patch"
-    ]
-}
diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
index bd4ab1c8b212..d2ff3656259f 100644
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -353,13 +353,6 @@ clang-14:
         repo: https://github.com/llvm/llvm-project
         revision: 4bc1d0b51c8e488d78ab69c8b19cfbcd1f7db6a4
 
-clang-15:
-    description: clang 15.0.0 source code
-    fetch:
-        type: git
-        repo: https://github.com/llvm/llvm-project
-        revision: 4ba6a9c9f65bbc8bd06e3652cb20fd4dfc846137
-
 clang-trunk:
     description: clang main branch source code
     attributes:
diff --git a/taskcluster/ci/toolchain/clang-tidy.yml b/taskcluster/ci/toolchain/clang-tidy.yml
index 0243b4fd784c..fec7f88b318a 100644
--- a/taskcluster/ci/toolchain/clang-tidy.yml
+++ b/taskcluster/ci/toolchain/clang-tidy.yml
@@ -23,7 +23,7 @@ job-defaults:
             - 'build/build-clang/build-clang.py'
     fetches:
         fetch:
-            - clang-15
+            - clang-14
 
 linux64-clang-tidy:
     index:
@@ -38,7 +38,7 @@ linux64-clang-tidy:
             - 'build/build-clang/clang-tidy-linux64.json'
     fetches:
         toolchain:
-            - linux64-clang-15
+            - linux64-clang-14
             - linux64-toolchain-sysroot
 
 macosx64-clang-tidy:
@@ -56,7 +56,7 @@ macosx64-clang-tidy:
     fetches:
         toolchain:
             - linux64-cctools-port
-            - linux64-clang-15
+            - linux64-clang-14
             - macosx64-sdk
 
 macosx64-arch64-clang-tidy:
@@ -77,7 +77,7 @@ macosx64-arch64-clang-tidy:
     fetches:
         toolchain:
             - linux64-cctools-port
-            - linux64-clang-15
+            - linux64-clang-14
             - macosx64-sdk
 
 win64-clang-tidy:
@@ -127,5 +127,5 @@ linux64-clang-tidy-external:
         fetch:
             - civet-source
         toolchain:
-            - linux64-clang-15
+            - linux64-clang-14
             - linux64-toolchain-sysroot
diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml
index 18f57151e09a..2bd096702596 100644
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -32,6 +32,53 @@ linux64-clang-5.0:
         toolchain:
             - linux64-toolchain-sysroot
 
+linux64-clang-14-mingw-x86:
+    description: "MinGW-Clang 14 x86 toolchain build"
+    treeherder:
+        symbol: TMW(clang-14-x86)
+    worker-type: b-linux
+    run:
+        script: build-clang-mingw.sh
+        arguments:
+            - 'x86'
+        toolchain-alias:
+            by-project:
+                toolchains: null
+                default: linux64-clang-mingw-x86
+        toolchain-artifact: public/build/clangmingw.tar.zst
+    fetches:
+        fetch:
+            - clang-14
+            - mingw-w64
+            - llvm-mingw
+            - gcc-9.4.0
+        toolchain:
+            - linux64-clang-14
+
+linux64-clang-14-mingw-x64:
+    description: "MinGW-Clang 14 x64 toolchain build"
+    treeherder:
+        symbol: TMW(clang-14-x64)
+        tier: 1
+    worker-type: b-linux
+    run:
+        script: build-clang-mingw.sh
+        arguments:
+            - 'x64'
+        toolchain-alias:
+            by-project:
+                toolchains: null
+                default: linux64-clang-mingw-x64
+        toolchain-artifact: public/build/clangmingw.tar.zst
+    fetches:
+        fetch:
+            - clang-14
+            - mingw-w64
+            - llvm-mingw
+            - gcc-9.4.0
+        toolchain:
+            - linux64-clang-14
+
 linux64-clang-14-stage1:
     description: "Clang 14 toolchain build"
     treeherder:
@@ -47,6 +94,10 @@ linux64-clang-14-stage1:
             - 'build/build-clang/linux64.json'
             - 'build/build-clang/clang-14.json'
             - 'build/build-clang/1stage.json'
+        toolchain-alias:
+            by-project:
+                toolchains: null
+                default: linux64-clang-toolchain
         toolchain-artifact: public/build/clang.tar.zst
     fetches:
         fetch:
@@ -54,6 +105,57 @@ linux64-clang-14-stage1:
         toolchain:
             - linux64-toolchain-sysroot
 
+linux64-clang-14-profile:
+    description: "Clang 14 toolchain build"
+    treeherder:
+        symbol: TL(clang-14-profile)
+    run:
+        using: toolchain-script
+        script: build-clang.sh
+        arguments:
+            - 'build/build-clang/linux64.json'
+            - 'build/build-clang/clang-14.json'
+            - 'build/build-clang/skip-stage-1.json'
+            - 'build/build-clang/profile.json'
+        resources:
+            - 'build/build-clang/linux64.json'
+            - 'build/build-clang/clang-14.json'
+            - 'build/build-clang/skip-stage-1.json'
+            - 'build/build-clang/profile.json'
+        toolchain-artifact: public/build/merged.profdata
+    fetches:
+        fetch:
+            - clang-14
+        toolchain:
+            - linux64-clang-14-stage1
+            - linux64-x64-compiler-rt-14
+            - linux64-toolchain-sysroot
+
+linux64-clang-14-raw:
+    description: "Clang 14 toolchain build"
+    treeherder:
+        symbol: TL(clang-14-raw)
+    run:
+        script: build-clang.sh
+        arguments:
+            - 'build/build-clang/linux64.json'
+            - 'build/build-clang/clang-14.json'
+            - 'build/build-clang/skip-3-stages.json'
+            - 'build/build-clang/4stages-pgo.json'
+        resources:
+            - 'build/build-clang/linux64.json'
+            - 'build/build-clang/clang-14.json'
+            - 'build/build-clang/skip-3-stages.json'
+            - 'build/build-clang/4stages-pgo.json'
+        toolchain-artifact: public/build/clang.tar.zst
+    fetches:
+        fetch:
+            - clang-14
+        toolchain:
+            - linux64-clang-14-stage1
+            - linux64-clang-14-profile
+            - linux64-toolchain-sysroot
+
 linux64-clang-14:
     description: "Clang 14 toolchain build"
     attributes:
@@ -65,11 +167,27 @@ linux64-clang-14:
         max-run-time: 600
     run:
         script: repack-clang.sh
+        toolchain-alias:
+            by-project:
+                toolchains: null
+                default: linux64-clang
         toolchain-artifact: public/build/clang.tar.zst
     fetches:
         toolchain:
             - linux64-cctools-port
-            - linux64-clang-14-stage1
+            - linux64-clang-14-raw
+            - android-aarch64-compiler-rt-14
+            - android-arm-compiler-rt-14
+            - android-x64-compiler-rt-14
+            - android-x86-compiler-rt-14
+            - linux64-aarch64-compiler-rt-14
+            - linux64-x64-compiler-rt-14
+            - linux64-x86-compiler-rt-14
+            - macosx64-aarch64-compiler-rt-14
+            - macosx64-x64-compiler-rt-14
+            - wasm32-wasi-compiler-rt-14
+            - win32-compiler-rt-14
+            - win64-compiler-rt-14
 
 macosx64-clang-14-raw:
     description: "Clang 14 toolchain build"
@@ -83,11 +201,13 @@ macosx64-clang-14-raw:
         arguments:
             - 'build/build-clang/macosx64.json'
             - 'build/build-clang/clang-14.json'
-            - 'build/build-clang/1stage.json'
+            - 'build/build-clang/skip-3-stages.json'
+            - 'build/build-clang/4stages-pgo.json'
         resources:
             - 'build/build-clang/macosx64.json'
             - 'build/build-clang/clang-14.json'
-            - 'build/build-clang/1stage.json'
+            - 'build/build-clang/skip-3-stages.json'
+            - 'build/build-clang/4stages-pgo.json'
         toolchain-artifact: public/build/clang.tar.zst
     fetches:
         fetch:
@@ -95,201 +215,16 @@ macosx64-clang-14-raw:
         toolchain:
             - linux64-cctools-port
             - linux64-clang-14-stage1
+            - linux64-clang-14-profile
             - macosx64-sdk
+            - macosx64-x64-compiler-rt-14
 
-linux64-clang-15-mingw-x86:
-    description: "MinGW-Clang 15 x86 toolchain build"
-    treeherder:
-        symbol: TMW(clang-15-x86)
-    worker-type: b-linux
-    run:
-        script: build-clang-mingw.sh
-        arguments:
-            - 'x86'
-        toolchain-alias:
-            by-project:
-                toolchains: null
-                default: linux64-clang-mingw-x86
-        toolchain-artifact: public/build/clangmingw.tar.zst
-    fetches:
-        fetch:
-            - clang-15
-            - mingw-w64
-            - llvm-mingw
-            - gcc-9.4.0
-        toolchain:
-            - linux64-clang-15
-
-linux64-clang-15-mingw-x64:
-    description: "MinGW-Clang 15 x64 toolchain build"
-    treeherder:
-        symbol: TMW(clang-15-x64)
-        tier: 1
-    worker-type: b-linux
-    run:
-        script: build-clang-mingw.sh
-        arguments:
-            - 'x64'
-        toolchain-alias:
-            by-project:
-                toolchains: null
-                default: linux64-clang-mingw-x64
-        toolchain-artifact: public/build/clangmingw.tar.zst
-    fetches:
-        fetch:
-            - clang-15
-            - mingw-w64
-            - llvm-mingw
-            - gcc-9.4.0
-        toolchain:
-            - linux64-clang-15
-
-linux64-clang-15-stage1:
-    description: "Clang 15 toolchain build"
-    treeherder:
-        symbol: TL(clang-15-stage1)
-    run:
-        using: toolchain-script
-        script: build-clang.sh
-        arguments:
-            - 'build/build-clang/linux64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/1stage.json'
-        resources:
-            - 'build/build-clang/linux64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/1stage.json'
-        toolchain-alias:
-            by-project:
-                toolchains: null
-                default: linux64-clang-toolchain
-        toolchain-artifact: public/build/clang.tar.zst
-    fetches:
-        fetch:
-            - clang-15
-        toolchain:
-            - linux64-toolchain-sysroot
-
-linux64-clang-15-profile:
-    description: "Clang 15 toolchain build"
-    treeherder:
-        symbol: TL(clang-15-profile)
-    run:
-        using: toolchain-script
-        script: build-clang.sh
-        arguments:
-            - 'build/build-clang/linux64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/skip-stage-1.json'
-            - 'build/build-clang/profile.json'
-        resources:
-            - 'build/build-clang/linux64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/skip-stage-1.json'
-            - 'build/build-clang/profile.json'
-        toolchain-artifact: public/build/merged.profdata
-    fetches:
-        fetch:
-            - clang-15
-        toolchain:
-            - linux64-clang-15-stage1
-            - linux64-x64-compiler-rt-15
-            - linux64-toolchain-sysroot
-
-linux64-clang-15-raw:
-    description: "Clang 15 toolchain build"
-    treeherder:
-        symbol: TL(clang-15-raw)
-    run:
-        script: build-clang.sh
-        arguments:
-            - 'build/build-clang/linux64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/skip-3-stages.json'
-            - 'build/build-clang/4stages-pgo.json'
-        resources:
-            - 'build/build-clang/linux64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/skip-3-stages.json'
-            - 'build/build-clang/4stages-pgo.json'
-        toolchain-artifact: public/build/clang.tar.zst
-    fetches:
-        fetch:
-            - clang-15
-        toolchain:
-            - linux64-clang-15-stage1
-            - linux64-clang-15-profile
-            - linux64-toolchain-sysroot
-
-linux64-clang-15:
-    description: "Clang 15 toolchain build"
+macosx64-clang-14:
+    description: "Clang 14 toolchain repack with MacOS Compiler RT libs"
     attributes:
         local-toolchain: true
     treeherder:
-        symbol: TL(clang-15)
-    worker-type: b-linux
-    worker:
-        max-run-time: 600
-    run:
-        script: repack-clang.sh
-        toolchain-alias:
-            by-project:
-                toolchains: null
-                default: linux64-clang
-        toolchain-artifact: public/build/clang.tar.zst
-    fetches:
-        toolchain:
-            - linux64-cctools-port
-            - linux64-clang-15-raw
-            - android-aarch64-compiler-rt-15
-            - android-arm-compiler-rt-15
-            - android-x64-compiler-rt-15
-            - android-x86-compiler-rt-15
-            - linux64-aarch64-compiler-rt-15
-            - linux64-x64-compiler-rt-15
-            - linux64-x86-compiler-rt-15
-            - macosx64-aarch64-compiler-rt-15
-            - macosx64-x64-compiler-rt-15
-            - wasm32-wasi-compiler-rt-15
-            - win32-compiler-rt-15
-            - win64-compiler-rt-15
-
-macosx64-clang-15-raw:
-    description: "Clang 15 toolchain build"
-    treeherder:
-        symbol: TM(clang-15-raw)
-    worker-type: b-linux-large
-    worker:
-        max-run-time: 3600
-    run:
-        script: build-clang.sh
-        arguments:
-            - 'build/build-clang/macosx64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/skip-3-stages.json'
-            - 'build/build-clang/4stages-pgo.json'
-        resources:
-            - 'build/build-clang/macosx64.json'
-            - 'build/build-clang/clang-15.json'
-            - 'build/build-clang/skip-3-stages.json'
-            - 'build/build-clang/4stages-pgo.json'
-        toolchain-artifact: public/build/clang.tar.zst
-    fetches:
-        fetch:
-            - clang-15
-        toolchain:
-            - linux64-cctools-port
-            - linux64-clang-15-stage1
-            - linux64-clang-15-profile
-            - macosx64-sdk
-            - macosx64-x64-compiler-rt-15
-
-macosx64-clang-15:
-    description: "Clang 15 toolchain repack with MacOS Compiler RT libs"
-    attributes:
-        local-toolchain: true
-    treeherder:
-        symbol: TM(clang-15)
+        symbol: TM(clang-14)
     worker-type: b-linux
     worker:
         max-run-time: 600
@@ -305,24 +240,24 @@ macosx64-clang-15:
     fetches:
         toolchain:
             - linux64-cctools-port
-            - macosx64-clang-15-raw
-            - android-aarch64-compiler-rt-15
-            - android-arm-compiler-rt-15
-            - android-x64-compiler-rt-15
-            - android-x86-compiler-rt-15
-            - linux64-aarch64-compiler-rt-15
-            - linux64-x64-compiler-rt-15
-            - linux64-x86-compiler-rt-15
-            - macosx64-aarch64-compiler-rt-15
-            - macosx64-x64-compiler-rt-15
-            - wasm32-wasi-compiler-rt-15
-            - win32-compiler-rt-15
-            - win64-compiler-rt-15
+            - macosx64-clang-14-raw
+            - android-aarch64-compiler-rt-14
+            - android-arm-compiler-rt-14
+            - android-x64-compiler-rt-14
+            - android-x86-compiler-rt-14
+            - linux64-aarch64-compiler-rt-14
+            - linux64-x64-compiler-rt-14
+            - linux64-x86-compiler-rt-14
+            - macosx64-aarch64-compiler-rt-14
+            - macosx64-x64-compiler-rt-14
+            - wasm32-wasi-compiler-rt-14
+            - win32-compiler-rt-14
+            - win64-compiler-rt-14
 
-macosx64-aarch64-clang-15-raw:
-    description: "Clang 15 toolchain build"
+macosx64-aarch64-clang-14-raw:
+    description: "Clang 14 toolchain build"
     treeherder:
-        symbol: TM(clang-15-aarch64-raw)
+        symbol: TM(clang-14-aarch64-raw)
     worker-type: b-linux-large
     worker:
         env:
@@ -332,31 +267,31 @@ macosx64-aarch64-clang-15-raw:
         script: build-clang.sh
         arguments:
             - 'build/build-clang/macosx64.json'
-            - 'build/build-clang/clang-15.json'
+            - 'build/build-clang/clang-14.json'
             - 'build/build-clang/skip-3-stages.json'
             - 'build/build-clang/4stages-pgo.json'
         resources:
             - 'build/build-clang/macosx64.json'
-            - 'build/build-clang/clang-15.json'
+            - 'build/build-clang/clang-14.json'
             - 'build/build-clang/skip-3-stages.json'
             - 'build/build-clang/4stages-pgo.json'
         toolchain-artifact: public/build/clang.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
             - linux64-cctools-port
-            - linux64-clang-15-stage1
-            - linux64-clang-15-profile
+            - linux64-clang-14-stage1
+            - linux64-clang-14-profile
             - macosx64-sdk
-            - macosx64-aarch64-compiler-rt-15
+            - macosx64-aarch64-compiler-rt-14
 
-macosx64-aarch64-clang-15:
-    description: "Clang 15 toolchain repack with MacOS Compiler RT libs"
+macosx64-aarch64-clang-14:
+    description: "Clang 14 toolchain repack with MacOS Compiler RT libs"
     attributes:
         local-toolchain: true
     treeherder:
-        symbol: TM(clang-15-aarch64)
+        symbol: TM(clang-14-aarch64)
     worker-type: b-linux
     worker:
         max-run-time: 600
@@ -370,34 +305,34 @@ macosx64-aarch64-clang-15:
     fetches:
         toolchain:
             - linux64-cctools-port
-            - macosx64-aarch64-clang-15-raw
-            - android-aarch64-compiler-rt-15
-            - android-arm-compiler-rt-15
-            - android-x64-compiler-rt-15
-            - android-x86-compiler-rt-15
-            - linux64-aarch64-compiler-rt-15
-            - linux64-x64-compiler-rt-15
-            - linux64-x86-compiler-rt-15
-            - macosx64-aarch64-compiler-rt-15
-            - macosx64-x64-compiler-rt-15
-            - wasm32-wasi-compiler-rt-15
-            - win32-compiler-rt-15
-            - win64-compiler-rt-15
+            - macosx64-aarch64-clang-14-raw
+            - android-aarch64-compiler-rt-14
+            - android-arm-compiler-rt-14
+            - android-x64-compiler-rt-14
+            - android-x86-compiler-rt-14
+            - linux64-aarch64-compiler-rt-14
+            - linux64-x64-compiler-rt-14
+            - linux64-x86-compiler-rt-14
+            - macosx64-aarch64-compiler-rt-14
+            - macosx64-x64-compiler-rt-14
+            - wasm32-wasi-compiler-rt-14
+            - win32-compiler-rt-14
+            - win64-compiler-rt-14
 
-win64-clang-15-stage1:
-    description: "Clang-cl 15 toolchain build stage 1"
+win64-clang-14-stage1:
+    description: "Clang-cl 14 toolchain build stage 1"
     treeherder:
-        symbol: TW64(clang-15-stage1)
+        symbol: TW64(clang-14-stage1)
     worker-type: b-win2012
     run:
         script: build-clang.sh
         arguments:
             - 'build/build-clang/win64.json'
-            - 'build/build-clang/clang-15.json'
+            - 'build/build-clang/clang-14.json'
             - 'build/build-clang/1stage.json'
         resources:
             - 'build/build-clang/win64.json'
-            - 'build/build-clang/clang-15.json'
+            - 'build/build-clang/clang-14.json'
             - 'build/build-clang/1stage.json'
         toolchain-alias:
             by-project:
@@ -406,16 +341,16 @@ win64-clang-15-stage1:
         toolchain-artifact: public/build/clang.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
             - cmake
             - ninja
         toolchain:
             - win64-vs2019
 
-win64-clang-15-raw:
-    description: "Clang-cl 15 toolchain build"
+win64-clang-14-raw:
+    description: "Clang-cl 14 toolchain build"
     treeherder:
-        symbol: TW64(clang-15-raw)
+        symbol: TW64(clang-14-raw)
     worker-type: b-win2012
     worker:
         max-run-time: 9000
@@ -423,31 +358,31 @@ win64-clang-15-raw:
         script: build-clang.sh
         arguments:
             - 'build/build-clang/win64.json'
-            - 'build/build-clang/clang-15.json'
+            - 'build/build-clang/clang-14.json'
             - 'build/build-clang/skip-stage-1-win64.json'
             - 'build/build-clang/4stages-pgo.json'
         resources:
             - 'build/build-clang/win64.json'
-            - 'build/build-clang/clang-15.json'
+            - 'build/build-clang/clang-14.json'
             - 'build/build-clang/skip-stage-1-win64.json'
             - 'build/build-clang/4stages-pgo.json'
         toolchain-artifact: public/build/clang.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
             - cmake
             - ninja
         toolchain:
-            - win64-clang-15-stage1
-            - win64-compiler-rt-15
+            - win64-clang-14-stage1
+            - win64-compiler-rt-14
             - win64-vs2019
 
-win64-clang-15:
-    description: "Clang-cl 15 toolchain build"
+win64-clang-14:
+    description: "Clang-cl 14 toolchain build"
     attributes:
         local-toolchain: true
     treeherder:
-        symbol: TW64(clang-15)
+        symbol: TW64(clang-14)
     worker-type: b-linux
     worker:
         max-run-time: 600
@@ -461,19 +396,19 @@ win64-clang-15:
     fetches:
         toolchain:
             - linux64-cctools-port
-            - win64-clang-15-raw
-            - android-aarch64-compiler-rt-15
-            - android-arm-compiler-rt-15
-            - android-x64-compiler-rt-15
-            - android-x86-compiler-rt-15
-            - linux64-aarch64-compiler-rt-15
-            - linux64-x64-compiler-rt-15
-            - linux64-x86-compiler-rt-15
-            - macosx64-aarch64-compiler-rt-15
-            - macosx64-x64-compiler-rt-15
-            - wasm32-wasi-compiler-rt-15
-            - win32-compiler-rt-15
-            - win64-compiler-rt-15
+            - win64-clang-14-raw
+            - android-aarch64-compiler-rt-14
+            - android-arm-compiler-rt-14
+            - android-x64-compiler-rt-14
+            - android-x86-compiler-rt-14
+            - linux64-aarch64-compiler-rt-14
+            - linux64-x64-compiler-rt-14
+            - linux64-x86-compiler-rt-14
+            - macosx64-aarch64-compiler-rt-14
+            - macosx64-x64-compiler-rt-14
+            - wasm32-wasi-compiler-rt-14
+            - win32-compiler-rt-14
+            - win64-compiler-rt-14
 
 linux64-clang-trunk-mingw-x86:
     description: "MinGW-Clang trunk x86 toolchain build"
diff --git a/taskcluster/ci/toolchain/compiler-rt.yml b/taskcluster/ci/toolchain/compiler-rt.yml
index 1c4a8d3c9aa9..7965e012c224 100644
--- a/taskcluster/ci/toolchain/compiler-rt.yml
+++ b/taskcluster/ci/toolchain/compiler-rt.yml
@@ -10,210 +10,210 @@ job-defaults:
         using: toolchain-script
         script: build-compiler-rt.sh
 
-android-aarch64-compiler-rt-15:
-    description: "android aarch64 Compiler-rt for Clang 15 toolchain build"
+android-aarch64-compiler-rt-14:
+    description: "android aarch64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TA(aarch64-crt-15)
+        symbol: TA(aarch64-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-aarch64-linux-android.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - linux64-android-ndk-linux-repack
 
-android-arm-compiler-rt-15:
-    description: "android arm Compiler-rt for Clang 15 toolchain build"
+android-arm-compiler-rt-14:
+    description: "android arm Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TA(arm-crt-15)
+        symbol: TA(arm-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-armv7-linux-android.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - linux64-android-ndk-linux-repack
 
-android-x86-compiler-rt-15:
-    description: "android x86 Compiler-rt for Clang 15 toolchain build"
+android-x86-compiler-rt-14:
+    description: "android x86 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TA(x86-crt-15)
+        symbol: TA(x86-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-i686-linux-android.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - linux64-android-ndk-linux-repack
 
-android-x64-compiler-rt-15:
-    description: "android x64 Compiler-rt for Clang 15 toolchain build"
+android-x64-compiler-rt-14:
+    description: "android x64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TA(x64-crt-15)
+        symbol: TA(x64-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-x86_64-linux-android.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - linux64-android-ndk-linux-repack
 
-linux64-x86-compiler-rt-15:
-    description: "Linux x86 Compiler-rt for Clang 15 toolchain build"
+linux64-x86-compiler-rt-14:
+    description: "Linux x86 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TL(x86-crt-15)
+        symbol: TL(x86-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-i686-unknown-linux-gnu.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - sysroot-i686-linux-gnu
 
-linux64-x64-compiler-rt-15:
-    description: "Linux x64 Compiler-rt for Clang 15 toolchain build"
+linux64-x64-compiler-rt-14:
+    description: "Linux x64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TL(x64-crt-15)
+        symbol: TL(x64-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-x86_64-unknown-linux-gnu.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - sysroot-x86_64-linux-gnu
 
-linux64-aarch64-compiler-rt-15:
-    description: "Linux aarch64 Compiler-rt for Clang 15 toolchain build"
+linux64-aarch64-compiler-rt-14:
+    description: "Linux aarch64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TL(aarch64-crt-15)
+        symbol: TL(aarch64-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-aarch64-unknown-linux-gnu.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - sysroot-aarch64-linux-gnu
 
-macosx64-x64-compiler-rt-15:
-    description: "macOS x64 Compiler-rt for Clang 15 toolchain build"
+macosx64-x64-compiler-rt-14:
+    description: "macOS x64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TM(x64-crt-15)
+        symbol: TM(x64-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-x86_64-apple-darwin.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - macosx64-sdk
 
-macosx64-aarch64-compiler-rt-15:
-    description: "macOS aarch64 Compiler-rt for Clang 15 toolchain build"
+macosx64-aarch64-compiler-rt-14:
+    description: "macOS aarch64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TM(aarch64-crt-15)
+        symbol: TM(aarch64-crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-aarch64-apple-darwin.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - macosx64-sdk
 
-win32-compiler-rt-15:
-    description: "win32 x86 Compiler-rt for Clang 15 toolchain build"
+win32-compiler-rt-14:
+    description: "win32 x86 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TW32(crt-15)
+        symbol: TW32(crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-i686-pc-windows-msvc.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - linux64-liblowercase
             - win64-vs2019
 
-win64-compiler-rt-15:
-    description: "win64 x64 Compiler-rt for Clang 15 toolchain build"
+win64-compiler-rt-14:
+    description: "win64 x64 Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TW64(crt-15)
+        symbol: TW64(crt-14)
     run:
         arguments:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
         toolchain-artifact: public/build/compiler-rt-x86_64-pc-windows-msvc.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
             - linux64-liblowercase
             - win64-vs2019
 
-wasm32-wasi-compiler-rt-15:
-    description: "wasm32-wasi Compiler-rt for Clang 15 toolchain build"
+wasm32-wasi-compiler-rt-14:
+    description: "wasm32-wasi Compiler-rt for Clang 14 toolchain build"
     treeherder:
-        symbol: TL(wasi-crt-15)
+        symbol: TL(wasi-crt-14)
     worker-type: b-linux-xlarge
     run:
         script: build-compiler-rt-wasi.sh
@@ -221,10 +221,10 @@ wasm32-wasi-compiler-rt-15:
         toolchain-alias: wasm32-wasi-compiler-rt
     fetches:
         fetch:
-            - clang-15
+            - clang-14
             - wasi-sdk
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
 
 android-aarch64-compiler-rt-trunk:
     description: "android aarch64 Compiler-rt for Clang trunk toolchain build"
diff --git a/taskcluster/ci/toolchain/llvm-symbolizer.yml b/taskcluster/ci/toolchain/llvm-symbolizer.yml
index f600bb75cb3e..0b6a9eddeb96 100644
--- a/taskcluster/ci/toolchain/llvm-symbolizer.yml
+++ b/taskcluster/ci/toolchain/llvm-symbolizer.yml
@@ -11,9 +11,9 @@ job-defaults:
         toolchain-artifact: public/build/llvm-symbolizer.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
         toolchain:
-            - linux64-clang-15-stage1
+            - linux64-clang-14-stage1
 
 linux64-llvm-symbolizer:
     description: "llvm-symbolizer for Linux"
@@ -22,9 +22,9 @@ linux64-llvm-symbolizer:
     run:
         arguments:
             - x86_64-unknown-linux-gnu
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
     fetches:
         toolchain:
@@ -37,9 +37,9 @@ macosx64-llvm-symbolizer:
     run:
         arguments:
             - x86_64-apple-darwin
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
     fetches:
         toolchain:
@@ -52,9 +52,9 @@ win64-llvm-symbolizer:
     run:
         arguments:
             - x86_64-pc-windows-msvc
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
         resources:
-            - build/build-clang/clang-15.json
+            - build/build-clang/clang-14.json
             - taskcluster/scripts/misc/build-llvm-common.sh
     fetches:
         toolchain:
diff --git a/taskcluster/ci/toolchain/sysroot.yml b/taskcluster/ci/toolchain/sysroot.yml
index df7e8356fab0..d210a9837d25 100644
--- a/taskcluster/ci/toolchain/sysroot.yml
+++ b/taskcluster/ci/toolchain/sysroot.yml
@@ -60,22 +60,22 @@ sysroot-x86_64-linux-gnu-x11:
         arguments:
             - amd64
 
-sysroot-wasm32-wasi-clang-15:
+sysroot-wasm32-wasi-clang-14:
     description: "Sysroot for wasi"
     attributes:
         local-toolchain: true
     treeherder:
-        symbol: TL(sysroot-wasi-15)
+        symbol: TL(sysroot-wasi-14)
     run:
         script: build-sysroot-wasi.sh
         toolchain-alias: sysroot-wasm32-wasi
         toolchain-artifact: public/build/sysroot-wasm32-wasi.tar.zst
     fetches:
         fetch:
-            - clang-15
+            - clang-14
             - wasi-sdk
         toolchain:
-            - linux64-clang-15
+            - linux64-clang-14
 
 sysroot-wasm32-wasi-clang-trunk:
     description: "Sysroot for wasi"
diff --git a/taskcluster/ci/webrender/kind.yml b/taskcluster/ci/webrender/kind.yml
index a360a29bc501..c813e9527b36 100644
--- a/taskcluster/ci/webrender/kind.yml
+++ b/taskcluster/ci/webrender/kind.yml
@@ -107,7 +107,7 @@ jobs:
                   name: public/build/wrench-macos-headless.tar.bz2
                   path: /builds/worker/artifacts/wrench-macos-headless.tar.bz2
         dependencies:
-            macosx64-clang-14: toolchain-macosx64-clang-14-raw
+            macosx64-clang-14: toolchain-macosx64-clang-14
         fetches:
             toolchain:
                 - linux64-rust-macos