From 1fd5c12c078f2d19496823d15a1c2ef6739764d7 Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Thu, 9 Jan 2025 11:28:40 -0800 Subject: [PATCH] Integrate LLVM at llvm/llvm-project@644de6ad1c75 Updates LLVM usage to match [644de6ad1c75](https://github.com/llvm/llvm-project/commit/644de6ad1c75) PiperOrigin-RevId: 713739019 --- bazel/import_llvm.bzl | 2 +- patches/llvm.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/bazel/import_llvm.bzl b/bazel/import_llvm.bzl index d9cb352f7..e5dd0a864 100644 --- a/bazel/import_llvm.bzl +++ b/bazel/import_llvm.bzl @@ -7,7 +7,7 @@ load( def import_llvm(name): """Imports LLVM.""" - LLVM_COMMIT = "faa3f752896903c2d09d389970d3d0ebf50a1073" + LLVM_COMMIT = "644de6ad1c758d3bf754d7d50b98c555df5231b1" new_git_repository( name = name, diff --git a/patches/llvm.patch b/patches/llvm.patch index 509398da9..f22579fca 100644 --- a/patches/llvm.patch +++ b/patches/llvm.patch @@ -1 +1,17 @@ Auto generated patch. Do not edit or delete it, even if empty. +diff -ruN --strip-trailing-cr a/llvm/lib/Support/Timer.cpp b/llvm/lib/Support/Timer.cpp +--- a/llvm/lib/Support/Timer.cpp ++++ b/llvm/lib/Support/Timer.cpp +@@ -507,11 +507,11 @@ + // Order of these members and initialization below is important. For example + // the DefaultTimerGroup uses the TimerLock. Most of these also depend on the + // options above. ++ std::once_flag InitDeferredFlag; + std::unique_ptr SignpostsPtr; + std::unique_ptr> TimerLockPtr; + std::unique_ptr DefaultTimerGroupPtr; + std::unique_ptr NamedGroupedTimersPtr; +- std::once_flag InitDeferredFlag; + TimerGlobals &initDeferred() { + std::call_once(InitDeferredFlag, [this]() { + SignpostsPtr = std::make_unique();