Skip to content

Commit a71de17

Browse files
gribozavrcopybara-github
authored andcommitted
Updates LLVM usage to match [99bb9a719cec](llvm/llvm-project@99bb9a719cec) PiperOrigin-RevId: 657153082
1 parent 8f92b38 commit a71de17

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

third_party/llvm/generated.patch

+37
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,41 @@
11
Auto generated patch. Do not edit or delete it, even if empty.
2+
diff -ruN --strip-trailing-cr a/clang/lib/Sema/SemaTemplateDeduction.cpp b/clang/lib/Sema/SemaTemplateDeduction.cpp
3+
--- a/clang/lib/Sema/SemaTemplateDeduction.cpp
4+
+++ b/clang/lib/Sema/SemaTemplateDeduction.cpp
5+
@@ -951,9 +951,11 @@
6+
7+
// Skip over the pack elements that were expanded into separate arguments.
8+
// If we partially expanded, this is the number of partial arguments.
9+
+ // FIXME: `&& FixedNumExpansions` is a workaround for UB described in
10+
+ // https://github.com/llvm/llvm-project/issues/100095
11+
if (IsPartiallyExpanded)
12+
PackElements += NumPartialPackArgs;
13+
- else if (IsExpanded)
14+
+ else if (IsExpanded && FixedNumExpansions)
15+
PackElements += *FixedNumExpansions;
16+
17+
for (auto &Pack : Packs) {
18+
diff -ruN --strip-trailing-cr a/clang/test/SemaCXX/pr100095.cpp b/clang/test/SemaCXX/pr100095.cpp
19+
--- a/clang/test/SemaCXX/pr100095.cpp
20+
+++ b/clang/test/SemaCXX/pr100095.cpp
21+
@@ -0,0 +1,17 @@
22+
+// RUN: %clang_cc1 -fsyntax-only -std=c++11 %s
23+
+// XFAIL: asserts
24+
+
25+
+template <class> struct Pair;
26+
+template <class...> struct Tuple {
27+
+ template <class _Up> Tuple(_Up);
28+
+};
29+
+template <typename> struct StatusOr;
30+
+template <int> using ElementType = int;
31+
+template <int... fields>
32+
+using Key = Tuple<ElementType<fields>...>;
33+
+template <int... fields>
34+
+StatusOr<Pair<Key<fields...>>> Parser();
35+
+struct Helper { Helper(Tuple<>, Tuple<>, int, int); };
36+
+struct D : Helper {
37+
+ D(Key<> f, int n, int e) : Helper(f, Parser<>, n, e) {}
38+
+};
239
diff -ruN --strip-trailing-cr a/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h b/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h
340
--- a/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h
441
+++ b/mlir/lib/Conversion/GPUCommon/OpToFuncCallLowering.h

third_party/llvm/workspace.bzl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
44

55
def repo(name):
66
"""Imports LLVM."""
7-
LLVM_COMMIT = "51d4980a133db12888207698e39c469cb7055cac"
8-
LLVM_SHA256 = "ee34426de8adf8408a610d0072e82b50bad0adac2c009f1f20072d626c0b876e"
7+
LLVM_COMMIT = "99bb9a719cec9513e72ad275c1c0302b76b6c408"
8+
LLVM_SHA256 = "af060bd4edd9340fd0b90ddd246c78e87dd374d5998a4c154f31d11f8888a076"
99

1010
tf_http_archive(
1111
name = name,

0 commit comments

Comments
 (0)