From 1a62f300693a762390a681a12ab263f3a7a05f49 Mon Sep 17 00:00:00 2001
From: Brian Salomon <bsalomon@google.com>
Date: Fri, 29 Apr 2022 10:44:38 -0400
Subject: [PATCH] Update to newer LLVM for Windows builds

Change-Id: I23b8c5a37a7ccaddccc042f8a4f70a2e29a41211
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/535399
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
---
 infra/bots/assets/clang_win/VERSION   |  2 +-
 infra/bots/assets/clang_win/create.py |  7 ++---
 infra/bots/tasks.json                 | 40 +++++++++++++--------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/infra/bots/assets/clang_win/VERSION b/infra/bots/assets/clang_win/VERSION
index 19c7bdba7b..8e2afd3427 100644
--- a/infra/bots/assets/clang_win/VERSION
+++ b/infra/bots/assets/clang_win/VERSION
@@ -1 +1 @@
-16
\ No newline at end of file
+17
\ No newline at end of file
diff --git a/infra/bots/assets/clang_win/create.py b/infra/bots/assets/clang_win/create.py
index b60c515d72..c71bee8659 100755
--- a/infra/bots/assets/clang_win/create.py
+++ b/infra/bots/assets/clang_win/create.py
@@ -21,12 +21,11 @@ import utils
 
 
 # Copied from https://cs.chromium.org/chromium/src/tools/clang/scripts/update.py
-CLANG_REVISION = '0e41d647ceaeb2195d5d9ab5ff25c19292a36bf5'
-CLANG_SVN_REVISION = 'n354867'
+CLANG_REVISION = 'llvmorg-15-init-8945-g3d7da810'
 CLANG_SUB_REVISION = 2
 
-PACKAGE_VERSION = '%s-%s-%s' % (CLANG_SVN_REVISION, CLANG_REVISION[:8],
-                                CLANG_SUB_REVISION)
+PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
+
 # (End copying)
 
 GS_URL = ('https://commondatastorage.googleapis.com/chromium-browser-clang'
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a70956556e..dbac7e9d7e 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -14675,7 +14675,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -14772,7 +14772,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -14869,7 +14869,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -14966,7 +14966,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15159,7 +15159,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15256,7 +15256,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15353,7 +15353,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15450,7 +15450,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15547,7 +15547,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15644,7 +15644,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15764,7 +15764,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15861,7 +15861,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -15958,7 +15958,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16055,7 +16055,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16152,7 +16152,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16249,7 +16249,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16369,7 +16369,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16466,7 +16466,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16563,7 +16563,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [
@@ -16660,7 +16660,7 @@
         {
           "name": "skia/bots/clang_win",
           "path": "clang_win",
-          "version": "version:16"
+          "version": "version:17"
         }
       ],
       "command": [