Skip to content

Commit 72800d5

Browse files
HEIR Teamcopybara-github
authored andcommitted
Updates LLVM usage to match [26362c68579d](llvm/llvm-project@26362c68579d) PiperOrigin-RevId: 836692850
1 parent f496fcf commit 72800d5

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

bazel/import_llvm.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ load(
77

88
def import_llvm(name):
99
"""Imports LLVM."""
10-
LLVM_COMMIT = "dea330b38d9c18b68219abdb52baaa72c9f1103d"
10+
LLVM_COMMIT = "26362c68579dd4375198aae4651b4d5f8a36c715"
1111

1212
new_git_repository(
1313
name = name,

patches/llvm.patch

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
Auto generated patch. Do not edit or delete it, even if empty.
2-
diff -ruN --strip-trailing-cr a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
3-
--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
4-
+++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
5-
@@ -1563,7 +1563,6 @@
6-
":basic",
7-
":config",
8-
":driver_options_inc_gen",
9-
- ":frontend",
10-
":lex",
11-
":options",
12-
":parse",
13-
@@ -1719,6 +1718,7 @@
14-
":ast",
15-
":basic",
16-
":config",
17-
+ ":driver",
18-
":driver_options_inc_gen",
19-
":edit",
20-
":lex",
2+
diff -ruN --strip-trailing-cr a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
3+
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
4+
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
5+
@@ -4095,6 +4095,12 @@
6+
llvm::SmallVector<size_t> occludedChildren;
7+
llvm::sort(
8+
indices.begin(), indices.end(), [&](const size_t a, const size_t b) {
9+
+ // Bail early if we are asked to look at the same index. If we do not
10+
+ // bail early, we can end up mistakenly adding indices to
11+
+ // occludedChildren. This can occur with some types of libc++ hardening.
12+
+ if (a == b)
13+
+ return false;
14+
+
15+
auto memberIndicesA = cast<ArrayAttr>(indexAttr[a]);
16+
auto memberIndicesB = cast<ArrayAttr>(indexAttr[b]);
17+

0 commit comments

Comments
 (0)