Skip to content

Commit bf3a7da

Browse files
XLS Teamcopybara-github
authored andcommitted
Updates LLVM usage to match [0c2701fe7fa0](llvm/llvm-project@0c2701fe7fa0) PiperOrigin-RevId: 837288411
1 parent d4eb606 commit bf3a7da

File tree

2 files changed

+2
-30
lines changed

2 files changed

+2
-30
lines changed

dependency_support/llvm/llvm.patch

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1 @@
11
Auto generated patch. Do not edit or delete it, even if empty.
2-
diff -ruN --strip-trailing-cr a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp
3-
--- a/clang/lib/Analysis/ThreadSafety.cpp
4-
+++ b/clang/lib/Analysis/ThreadSafety.cpp
5-
@@ -2820,7 +2820,7 @@
6-
case CFGElement::AutomaticObjectDtor: {
7-
CFGAutomaticObjDtor AD = BI.castAs<CFGAutomaticObjDtor>();
8-
const auto *DD = AD.getDestructorDecl(AC.getASTContext());
9-
- if (!DD->hasAttrs())
10-
+ if (!DD || !DD->hasAttrs())
11-
break;
12-
13-
LocksetBuilder.handleCall(
14-
diff -ruN --strip-trailing-cr a/clang/test/SemaCXX/no-warn-thread-safety-analysis.cpp b/clang/test/SemaCXX/no-warn-thread-safety-analysis.cpp
15-
--- a/clang/test/SemaCXX/no-warn-thread-safety-analysis.cpp
16-
+++ b/clang/test/SemaCXX/no-warn-thread-safety-analysis.cpp
17-
@@ -0,0 +1,12 @@
18-
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta -Wno-thread-safety-negative -fcxx-exceptions -DUSE_CAPABILITY=0 %s
19-
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta -Wno-thread-safety-negative -fcxx-exceptions -DUSE_CAPABILITY=1 %s
20-
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++17 -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta -Wno-thread-safety-negative -fcxx-exceptions -DUSE_CAPABILITY=0 %s
21-
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++17 -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta -Wno-thread-safety-negative -fcxx-exceptions -DUSE_CAPABILITY=1 %s
22-
+// expected-no-diagnostics
23-
+
24-
+struct foo {
25-
+ ~foo();
26-
+};
27-
+struct bar : foo {};
28-
+struct baz : bar {};
29-
+baz foobar(baz a) { return a; }

dependency_support/llvm/workspace.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
2020
def repo():
2121
"""Initialize the llvm-project repository."""
2222

23-
LLVM_COMMIT = "4f39a4ff0ada92870ca1c2dccad382ea04947da8"
24-
LLVM_SHA256 = "264c7cc3e166b840911494a2e94cff2ae8730b56239bd91dc8f65c8dc9468262"
23+
LLVM_COMMIT = "0c2701fe7fa002e1befc5f86c268a7964f96d286"
24+
LLVM_SHA256 = "50b0cb64adf161b4441ee32453f2eb9a015263e4eb3c036548f0207cbe3d0707"
2525

2626
maybe(
2727
http_archive,

0 commit comments

Comments
 (0)