Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] type_traits: Add is_constexpr() (#5997)

Browse Source
This commit is contained in:
Peter Johnson
2023-12-02 20:54:22 -08:00
committed by GitHub
parent 5172ab8fd0
commit 76ae090570
36 changed files with 65 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
upstream_utils/llvm_patches/0001-Remove-StringRef-ArrayRef-and-Optional.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:09:18 -0400
Subject: [PATCH 01/31] Remove StringRef, ArrayRef, and Optional
Subject: [PATCH 01/34] Remove StringRef, ArrayRef, and Optional
---
llvm/include/llvm/ADT/PointerUnion.h | 1 -

2
upstream_utils/llvm_patches/0002-Wrap-std-min-max-calls-in-parens-for-Windows-warning.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:12:41 -0400
Subject: [PATCH 02/31] Wrap std::min/max calls in parens, for Windows warnings
Subject: [PATCH 02/34] Wrap std::min/max calls in parens, for Windows warnings
---
llvm/include/llvm/ADT/DenseMap.h | 4 ++--

2
upstream_utils/llvm_patches/0003-Change-unique_function-storage-size.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:13:55 -0400
Subject: [PATCH 03/31] Change unique_function storage size
Subject: [PATCH 03/34] Change unique_function storage size
---
llvm/include/llvm/ADT/FunctionExtras.h | 4 ++--

2
upstream_utils/llvm_patches/0004-Threading-updates.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:17:19 -0400
Subject: [PATCH 04/31] Threading updates
Subject: [PATCH 04/34] Threading updates
- Remove guards for threads and exception
- Prefer scope gaurd over lock gaurd

2
upstream_utils/llvm_patches/0005-ifdef-guard-safety.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:28:13 -0400
Subject: [PATCH 05/31] \#ifdef guard safety
Subject: [PATCH 05/34] \#ifdef guard safety
Prevents redefinition if someone is pulling in real LLVM, since the macros are in global namespace
---

2
upstream_utils/llvm_patches/0006-Explicitly-use-std.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:37:34 -0400
Subject: [PATCH 06/31] Explicitly use std::
Subject: [PATCH 06/34] Explicitly use std::
---
llvm/include/llvm/ADT/SmallSet.h | 2 +-

2
upstream_utils/llvm_patches/0007-Remove-format_provider.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sat, 7 May 2022 22:53:50 -0400
Subject: [PATCH 07/31] Remove format_provider
Subject: [PATCH 07/34] Remove format_provider
---
llvm/include/llvm/Support/Chrono.h | 109 ------------------------

2
upstream_utils/llvm_patches/0008-Add-compiler-warning-pragmas.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 13:34:07 -0400
Subject: [PATCH 08/31] Add compiler warning pragmas
Subject: [PATCH 08/34] Add compiler warning pragmas
---
llvm/include/llvm/ADT/FunctionExtras.h | 11 +++++++++++

2
upstream_utils/llvm_patches/0009-Remove-unused-functions.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 13:43:50 -0400
Subject: [PATCH 09/31] Remove unused functions
Subject: [PATCH 09/34] Remove unused functions
---
llvm/include/llvm/ADT/SmallString.h | 85 +-----

2
upstream_utils/llvm_patches/0010-Detemplatize-SmallVectorBase.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Thu, 5 May 2022 23:18:34 -0400
Subject: [PATCH 10/31] Detemplatize SmallVectorBase
Subject: [PATCH 10/34] Detemplatize SmallVectorBase
---
llvm/include/llvm/ADT/SmallVector.h | 27 +++++++--------------

2
upstream_utils/llvm_patches/0011-Add-vectors-to-raw_ostream.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 13:48:59 -0400
Subject: [PATCH 11/31] Add vectors to raw_ostream
Subject: [PATCH 11/34] Add vectors to raw_ostream
---
llvm/include/llvm/Support/raw_ostream.h | 115 ++++++++++++++++++++++++

2
upstream_utils/llvm_patches/0012-Extra-collections-features.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Tue, 3 May 2022 22:16:10 -0400
Subject: [PATCH 12/31] Extra collections features
Subject: [PATCH 12/34] Extra collections features
---
llvm/include/llvm/ADT/StringMap.h | 103 +++++++++++++++++++++++++++++-

2
upstream_utils/llvm_patches/0013-EpochTracker-ABI-macro.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Wed, 4 May 2022 00:01:00 -0400
Subject: [PATCH 13/31] EpochTracker ABI macro
Subject: [PATCH 13/34] EpochTracker ABI macro
---
llvm/include/llvm/ADT/EpochTracker.h | 2 +-

2
upstream_utils/llvm_patches/0014-Delete-numbers-from-MathExtras.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Thu, 5 May 2022 18:09:45 -0400
Subject: [PATCH 14/31] Delete numbers from MathExtras
Subject: [PATCH 14/34] Delete numbers from MathExtras
---
llvm/include/llvm/Support/MathExtras.h | 36 --------------------------

2
upstream_utils/llvm_patches/0015-Add-lerp-and-sgn.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Tue, 3 May 2022 22:50:24 -0400
Subject: [PATCH 15/31] Add lerp and sgn
Subject: [PATCH 15/34] Add lerp and sgn
---
llvm/include/llvm/Support/MathExtras.h | 20 ++++++++++++++++++++

2
upstream_utils/llvm_patches/0016-Fixup-includes.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 16:38:11 -0400
Subject: [PATCH 16/31] Fixup includes
Subject: [PATCH 16/34] Fixup includes
---
llvm/include/llvm/ADT/StringMap.h | 4 ++++

2
upstream_utils/llvm_patches/0017-Use-std-is_trivially_copy_constructible.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 16:42:09 -0400
Subject: [PATCH 17/31] Use std::is_trivially_copy_constructible
Subject: [PATCH 17/34] Use std::is_trivially_copy_constructible
---
llvm/include/llvm/Support/type_traits.h | 16 ----------------

2
upstream_utils/llvm_patches/0018-Windows-support.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Tue, 3 May 2022 20:22:38 -0400
Subject: [PATCH 18/31] Windows support
Subject: [PATCH 18/34] Windows support
---
.../llvm/Support/Windows/WindowsSupport.h | 45 +++++----

2
upstream_utils/llvm_patches/0019-Prefer-fmtlib.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 16:46:20 -0400
Subject: [PATCH 19/31] Prefer fmtlib
Subject: [PATCH 19/34] Prefer fmtlib
---
llvm/lib/Support/ErrorHandling.cpp | 20 ++++++--------------

2
upstream_utils/llvm_patches/0020-Prefer-wpi-s-fs.h.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 16:49:36 -0400
Subject: [PATCH 20/31] Prefer wpi's fs.h
Subject: [PATCH 20/34] Prefer wpi's fs.h
---
llvm/include/llvm/Support/raw_ostream.h | 7 ++-----

2
upstream_utils/llvm_patches/0021-Remove-unused-functions.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 19:16:51 -0400
Subject: [PATCH 21/31] Remove unused functions
Subject: [PATCH 21/34] Remove unused functions
---
llvm/include/llvm/Support/raw_ostream.h | 5 +-

2
upstream_utils/llvm_patches/0022-OS-specific-changes.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 19:30:43 -0400
Subject: [PATCH 22/31] OS-specific changes
Subject: [PATCH 22/34] OS-specific changes
---
llvm/lib/Support/ErrorHandling.cpp | 16 +++++++---------

2
upstream_utils/llvm_patches/0023-Use-SmallVector-for-UTF-conversion.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Mon, 9 May 2022 00:04:30 -0400
Subject: [PATCH 23/31] Use SmallVector for UTF conversion
Subject: [PATCH 23/34] Use SmallVector for UTF conversion
---
llvm/include/llvm/Support/ConvertUTF.h | 6 +++---

2
upstream_utils/llvm_patches/0024-Prefer-to-use-static-pointers-in-raw_ostream.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Thu, 19 May 2022 00:58:36 -0400
Subject: [PATCH 24/31] Prefer to use static pointers in raw_ostream
Subject: [PATCH 24/34] Prefer to use static pointers in raw_ostream
See #1401
---

2
upstream_utils/llvm_patches/0025-constexpr-endian-byte-swap.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Thu, 19 May 2022 01:12:41 -0400
Subject: [PATCH 25/31] constexpr endian byte swap
Subject: [PATCH 25/34] constexpr endian byte swap
---
llvm/include/llvm/Support/Endian.h | 4 +++-

2
upstream_utils/llvm_patches/0026-Copy-type-traits-from-STLExtras.h-into-PointerUnion..patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Wed, 10 Aug 2022 17:07:52 -0700
Subject: [PATCH 26/31] Copy type traits from STLExtras.h into PointerUnion.h
Subject: [PATCH 26/34] Copy type traits from STLExtras.h into PointerUnion.h
---
llvm/include/llvm/ADT/PointerUnion.h | 46 ++++++++++++++++++++++++++++

2
upstream_utils/llvm_patches/0027-Remove-StringMap-test-for-llvm-sort.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Wed, 10 Aug 2022 22:35:00 -0700
Subject: [PATCH 27/31] Remove StringMap test for llvm::sort()
Subject: [PATCH 27/34] Remove StringMap test for llvm::sort()
---
llvm/unittests/ADT/StringMapTest.cpp | 14 --------------

2
upstream_utils/llvm_patches/0028-Unused-variable-in-release-mode.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Leander Schulten <Leander.Schulten@rwth-aachen.de>
Date: Mon, 10 Jul 2023 00:53:43 +0200
Subject: [PATCH 28/31] Unused variable in release mode
Subject: [PATCH 28/34] Unused variable in release mode
---
llvm/include/llvm/ADT/DenseMap.h | 2 +-

2
upstream_utils/llvm_patches/0029-Use-C-20-bit-header.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Tue, 11 Jul 2023 22:56:09 -0700
Subject: [PATCH 29/31] Use C++20 <bit> header
Subject: [PATCH 29/34] Use C++20 <bit> header
---
llvm/include/llvm/ADT/DenseMap.h | 3 +-

2
upstream_utils/llvm_patches/0030-Remove-DenseMap-GTest-printer-test.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Sun, 30 Jul 2023 14:17:37 -0700
Subject: [PATCH 30/31] Remove DenseMap GTest printer test
Subject: [PATCH 30/34] Remove DenseMap GTest printer test
LLVM modifies internal GTest headers to support it, which we can't do.
---

2
upstream_utils/llvm_patches/0031-Replace-deprecated-std-aligned_storage_t.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Fri, 15 Sep 2023 18:26:50 -0700
Subject: [PATCH 31/31] Replace deprecated std::aligned_storage_t
Subject: [PATCH 31/34] Replace deprecated std::aligned_storage_t
---
llvm/include/llvm/ADT/FunctionExtras.h | 4 ++--

2
upstream_utils/llvm_patches/0032-Fix-compilation-of-MathExtras.h-on-Windows-with-sdl.patch
View File

@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Benjamin Hall <bhallctre@gmail.com>
Date: Mon, 23 Oct 2023 21:36:40 -0400
Subject: [PATCH 32/32] Fix compilation of MathExtras.h on Windows with /sdl
Subject: [PATCH 32/34] Fix compilation of MathExtras.h on Windows with /sdl
See https://github.com/llvm/llvm-project/pull/68978
---

4
upstream_utils/llvm_patches/0033-raw_ostream-Add-SetNumBytesInBuffer.patch
View File

@@ -1,14 +1,14 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 29 Oct 2023 23:00:08 -0700
Subject: [PATCH 33/33] raw_ostream: Add SetNumBytesInBuffer
Subject: [PATCH 33/34] raw_ostream: Add SetNumBytesInBuffer
---
llvm/include/llvm/Support/raw_ostream.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
index 9a9a1f688313a5784a58a70f2cb4cc0d6ec70e79..39f98e4e7696e28587779e90a03995463767b02d 100644
index 9a9a1f688313a5784a58a70f2cb4cc0d6ec70e79..d832bcb97b4131a08ba3692eb438455e4c9764e4 100644
--- a/llvm/include/llvm/Support/raw_ostream.h
+++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -356,6 +356,11 @@ protected:

25
upstream_utils/llvm_patches/0034-type_traits.h-Add-is_constexpr.patch Normal file
View File

@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 2 Dec 2023 15:21:32 -0800
Subject: [PATCH 34/34] type_traits.h: Add is_constexpr()
---
llvm/include/llvm/Support/type_traits.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/llvm/include/llvm/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h
index 3171af93fa7ffe4707c03289270cf5951e3db7c5..e1b094640876649709abc199f83942dbfef09771 100644
--- a/llvm/include/llvm/Support/type_traits.h
+++ b/llvm/include/llvm/Support/type_traits.h
@@ -76,6 +76,11 @@ union trivial_helper {
} // end namespace detail
+// https://stackoverflow.com/questions/55288555/c-check-if-statement-can-be-evaluated-constexpr
+template<class Lambda, int=(Lambda{}(), 0)>
+constexpr bool is_constexpr(Lambda) { return true; }
+constexpr bool is_constexpr(...) { return false; }
+
} // end namespace llvm
#endif // LLVM_SUPPORT_TYPE_TRAITS_H

1
upstream_utils/update_llvm.py
View File

@@ -211,6 +211,7 @@ def main():
"0031-Replace-deprecated-std-aligned_storage_t.patch",
"0032-Fix-compilation-of-MathExtras.h-on-Windows-with-sdl.patch",
"0033-raw_ostream-Add-SetNumBytesInBuffer.patch",
"0034-type_traits.h-Add-is_constexpr.patch",
]:
git_am(
os.path.join(wpilib_root, "upstream_utils/llvm_patches", f),

5
wpiutil/src/main/native/thirdparty/llvm/include/wpi/type_traits.h vendored
View File

@@ -76,6 +76,11 @@ union trivial_helper {
} // end namespace detail
// https://stackoverflow.com/questions/55288555/c-check-if-statement-can-be-evaluated-constexpr
template<class Lambda, int=(Lambda{}(), 0)>
constexpr bool is_constexpr(Lambda) { return true; }
constexpr bool is_constexpr(...) { return false; }
} // end namespace wpi
#endif // WPIUTIL_WPI_TYPE_TRAITS_H