Bug 1847198 - Update builders to clang 16.0.6. r=firefox-build-system-reviewers,ahochheiden

Remove llvmorg-17-init-11952-g2f0a1699eab7.patch as it was applied
upstream.

Differential Revision: https://phabricator.services.mozilla.com/D185423
This commit is contained in:
Mike Hommey 2023-08-09 20:26:14 +00:00
Родитель 5aa77c98a8
Коммит 3cb3ea3b50
4 изменённых файлов: 3 добавлений и 53 удалений

Просмотреть файл

@ -21,7 +21,6 @@
"llvmorg-17-init-6905-gc81a322476a1.patch",
"llvmorg-17-init-6909-gd644ab022a7b.patch",
"llvmorg-17-init-8140-gb1bd52cd0d86.patch",
"llvmorg-17-init-11952-g2f0a1699eab7.patch",
"llvmorg-17-init-13415-g57dc16fbe307.patch",
"D146664_clang_15.patch",
"win64-ret-null-on-commitment-limit_clang_14.patch",

Просмотреть файл

@ -1,49 +0,0 @@
This is an incremental version of the patch, against 16.0.4, which
includes an earlier version of the patch.
From 3b0fad683523315e0fcd14039326fc0ce5eb350b Mon Sep 17 00:00:00 2001
From: Phoebe Wang <phoebe.wang@intel.com>
Date: Thu, 18 May 2023 12:38:12 +0800
Subject: [PATCH] Reland "[Driver] Support multi /guard: options"
Fixes unexpected warning.
Differential Revision: https://reviews.llvm.org/D150645
---
clang/lib/Driver/ToolChains/Clang.cpp | 1 +
clang/test/Driver/cl-options.c | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 238507e06335..77554aa2c462 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -7801,6 +7801,7 @@ void Clang::AddClangCLArgs(const ArgList &Args, types::ID InputType,
} else {
D.Diag(diag::err_drv_invalid_value) << A->getSpelling() << GuardArgs;
}
+ A->claim();
}
}
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index d96b887b7d48..326bc1162714 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -647,9 +647,12 @@
// RUN: %clang_cl /guard:ehcont -### -- %s 2>&1 | FileCheck -check-prefix=EHCONTGUARD %s
// EHCONTGUARD: -ehcontguard
-// RUN: %clang_cl /guard:cf /guard:ehcont -### -- %s 2>&1 | FileCheck -check-prefix=BOTHGUARD %s
+// RUN: %clang_cl /guard:cf /guard:ehcont -Wall -Wno-msvc-not-found -### -- %s 2>&1 | \
+// RUN: FileCheck -check-prefix=BOTHGUARD %s --implicit-check-not=warning:
// BOTHGUARD: -cfguard
// BOTHGUARD-SAME: -ehcontguard
+// BOTHGUARD: -guard:cf
+// BOTHGUARD-SAME: -guard:ehcont
// RUN: %clang_cl /guard:foo -### -- %s 2>&1 | FileCheck -check-prefix=CFGUARDINVALID %s
// CFGUARDINVALID: invalid value 'foo' in '/guard:'
--
2.40.0.1.gc689dad23e

Просмотреть файл

@ -355,11 +355,11 @@ clang-14:
revision: 4bc1d0b51c8e488d78ab69c8b19cfbcd1f7db6a4
clang-16:
description: clang 16.0.4 source code
description: clang 16.0.6 source code
fetch:
type: git
repo: https://github.com/llvm/llvm-project
revision: ae42196bc493ffe877a7e3dff8be32035dea4d07
revision: 7cbf1a2591520c2491aa35339f227775f4d3adf6
clang-trunk:
description: clang main branch source code

Просмотреть файл

@ -19,7 +19,7 @@ platforms:
# Minimum clang-tidy version that is required for all the following checkers
# to work properly.
# This is also used by 'mach clang-format'
package_version: "16.0.4"
package_version: "16.0.6"
clang_checkers:
- name: -*
publish: !!bool no