From fef3489ef38befa24e3ce5071adef4ef3ae5bfe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Thu, 27 Feb 2025 15:01:49 +0100
Subject: [PATCH] fix(llvm): backport patches for clang's Python bindings

---
 .../llvm15-clang-python-missing-kinds.patch   | 238 ++++++++++++++++++
 packages/llvm/package.py                      |  16 ++
 2 files changed, 254 insertions(+)
 create mode 100644 packages/llvm/llvm15-clang-python-missing-kinds.patch

diff --git a/packages/llvm/llvm15-clang-python-missing-kinds.patch b/packages/llvm/llvm15-clang-python-missing-kinds.patch
new file mode 100644
index 00000000..d45dc630
--- /dev/null
+++ b/packages/llvm/llvm15-clang-python-missing-kinds.patch
@@ -0,0 +1,238 @@
+From eb264d825beb048c6e673ddaf5aca069511fcfb3 Mon Sep 17 00:00:00 2001
+From: ykiko <ykikoykikoykiko@gmail.com>
+Date: Mon, 18 Mar 2024 22:13:10 +0800
+Subject: [PATCH] Add some missing Kinds to libclang python bindings (#85571)
+
+Add some Kinds existing in Index.h but missing in cindex.py.
+---
+ clang/bindings/python/clang/cindex.py | 173 +++++++++++++++++++++++++-
+ clang/docs/ReleaseNotes.rst           |   2 +
+ clang/include/clang-c/Index.h         |   2 +-
+ 3 files changed, 175 insertions(+), 2 deletions(-)
+
+diff --git a/clang/bindings/python/clang/cindex.py b/clang/bindings/python/clang/cindex.py
+index 44a34ca196274..302d99dccd77b 100644
+--- a/clang/bindings/python/clang/cindex.py
++++ b/clang/bindings/python/clang/cindex.py
+@@ -1091,6 +1091,29 @@ def __repr__(self):
+ # Represents an @available(...) check.
+ CursorKind.OBJC_AVAILABILITY_CHECK_EXPR = CursorKind(148)
+ 
++# Fixed point literal.
++CursorKind.FIXED_POINT_LITERAL = CursorKind(149)
++
++# OpenMP 5.0 [2.1.4, Array Shaping].
++CursorKind.OMP_ARRAY_SHAPING_EXPR = CursorKind(150)
++
++# OpenMP 5.0 [2.1.6 Iterators].
++CursorKind.OMP_ITERATOR_EXPR = CursorKind(151)
++
++# OpenCL's addrspace_cast<> expression.
++CursorKind.CXX_ADDRSPACE_CAST_EXPR = CursorKind(152)
++
++# Expression that references a C++20 concept.
++CursorKind.CONCEPT_SPECIALIZATION_EXPR = CursorKind(153)
++
++# Expression that references a C++20 requires expression.
++CursorKind.REQUIRES_EXPR = CursorKind(154)
++
++# Expression that references a C++20 parenthesized list aggregate initializer.
++CursorKind.CXX_PAREN_LIST_INIT_EXPR = CursorKind(155)
++
++# Represents a C++26 pack indexing expression.
++CursorKind.PACK_INDEXING_EXPR = CursorKind(156)
+ 
+ # A statement whose specific kind is not exposed via this interface.
+ #
+@@ -1312,6 +1335,114 @@ def __repr__(self):
+ # OpenMP teams distribute directive.
+ CursorKind.OMP_TEAMS_DISTRIBUTE_DIRECTIVE = CursorKind(271)
+ 
++# OpenMP teams distribute simd directive.
++CursorKind.OMP_TEAMS_DISTRIBUTE_DIRECTIVE = CursorKind(272)
++
++# OpenMP teams distribute parallel for simd directive.
++CursorKind.OMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_SIMD_DIRECTIVE = CursorKind(273)
++
++# OpenMP teams distribute parallel for directive.
++CursorKind.OMP_TEAMS_DISTRIBUTE_PARALLEL_FOR_DIRECTIVE = CursorKind(274)
++
++# OpenMP target teams directive.
++CursorKind.OMP_TARGET_TEAMS_DIRECTIVE = CursorKind(275)
++
++# OpenMP target teams distribute directive.
++CursorKind.OMP_TARGET_TEAMS_DISTRIBUTE_DIRECTIVE = CursorKind(276)
++
++# OpenMP target teams distribute parallel for directive.
++CursorKind.OMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_DIRECTIVE = CursorKind(277)
++
++# OpenMP target teams distribute parallel for simd directive.
++CursorKind.OMP_TARGET_TEAMS_DISTRIBUTE_PARALLEL_FOR_SIMD_DIRECTIVE = CursorKind(278)
++
++# OpenMP target teams distribute simd directive.
++CursorKind.OMP_TARGET_TEAMS_DISTRIBUTE_SIMD_DIRECTIVE = CursorKind(279)
++
++# C++2a std::bit_cast expression.
++CursorKind.BUILTIN_BIT_CAST_EXPR = CursorKind(280)
++
++# OpenMP master taskloop directive.
++CursorKind.OMP_MASTER_TASK_LOOP_DIRECTIVE = CursorKind(281)
++
++# OpenMP parallel master taskloop directive.
++CursorKind.OMP_PARALLEL_MASTER_TASK_LOOP_DIRECTIVE = CursorKind(282)
++
++# OpenMP master taskloop simd directive.
++CursorKind.OMP_MASTER_TASK_LOOP_SIMD_DIRECTIVE = CursorKind(283)
++
++# OpenMP parallel master taskloop simd directive.
++CursorKind.OMP_PARALLEL_MASTER_TASK_LOOP_SIMD_DIRECTIVE = CursorKind(284)
++
++# OpenMP parallel master directive.
++CursorKind.OMP_PARALLEL_MASTER_DIRECTIVE = CursorKind(285)
++
++# OpenMP depobj directive.
++CursorKind.OMP_DEPOBJ_DIRECTIVE = CursorKind(286)
++
++# OpenMP scan directive.
++CursorKind.OMP_SCAN_DIRECTIVE = CursorKind(287)
++
++# OpenMP tile directive.
++CursorKind.OMP_TILE_DIRECTIVE = CursorKind(288)
++
++# OpenMP canonical loop.
++CursorKind.OMP_CANONICAL_LOOP = CursorKind(289)
++
++# OpenMP interop directive.
++CursorKind.OMP_INTEROP_DIRECTIVE = CursorKind(290)
++
++# OpenMP dispatch directive.
++CursorKind.OMP_DISPATCH_DIRECTIVE = CursorKind(291)
++
++# OpenMP masked directive.
++CursorKind.OMP_MASKED_DIRECTIVE = CursorKind(292)
++
++# OpenMP unroll directive.
++CursorKind.OMP_UNROLL_DIRECTIVE = CursorKind(293)
++
++# OpenMP metadirective directive.
++CursorKind.OMP_META_DIRECTIVE = CursorKind(294)
++
++# OpenMP loop directive.
++CursorKind.OMP_GENERIC_LOOP_DIRECTIVE = CursorKind(295)
++
++# OpenMP teams loop directive.
++CursorKind.OMP_TEAMS_GENERIC_LOOP_DIRECTIVE = CursorKind(296)
++
++# OpenMP target teams loop directive.
++CursorKind.OMP_TARGET_TEAMS_GENERIC_LOOP_DIRECTIVE = CursorKind(297)
++
++# OpenMP parallel loop directive.
++CursorKind.OMP_PARALLEL_GENERIC_LOOP_DIRECTIVE = CursorKind(298)
++
++# OpenMP target parallel loop directive.
++CursorKind.OMP_TARGET_PARALLEL_GENERIC_LOOP_DIRECTIVE = CursorKind(299)
++
++# OpenMP parallel masked directive.
++CursorKind.OMP_PARALLEL_MASKED_DIRECTIVE = CursorKind(300)
++
++# OpenMP masked taskloop directive.
++CursorKind.OMP_MASKED_TASK_LOOP_DIRECTIVE = CursorKind(301)
++
++# OpenMP masked taskloop simd directive.
++CursorKind.OMP_MASKED_TASK_LOOP_SIMD_DIRECTIVE = CursorKind(302)
++
++# OpenMP parallel masked taskloop directive.
++CursorKind.OMP_PARALLEL_MASKED_TASK_LOOP_DIRECTIVE = CursorKind(303)
++
++# OpenMP parallel masked taskloop simd directive.
++CursorKind.OMP_PARALLEL_MASKED_TASK_LOOP_SIMD_DIRECTIVE = CursorKind(304)
++
++# OpenMP error directive.
++CursorKind.OMP_ERROR_DIRECTIVE = CursorKind(305)
++
++# OpenMP scope directive.
++CursorKind.OMP_SCOPE_DIRECTIVE = CursorKind(306)
++
++# OpenACC Compute Construct.
++CursorKind.OPEN_ACC_COMPUTE_DIRECTIVE = CursorKind(320)
++
+ ###
+ # Other Kinds
+ 
+@@ -1349,6 +1480,24 @@ def __repr__(self):
+ 
+ CursorKind.DLLEXPORT_ATTR = CursorKind(418)
+ CursorKind.DLLIMPORT_ATTR = CursorKind(419)
++CursorKind.NS_RETURNS_RETAINED = CursorKind(420)
++CursorKind.NS_RETURNS_NOT_RETAINED = CursorKind(421)
++CursorKind.NS_RETURNS_AUTORELEASED = CursorKind(422)
++CursorKind.NS_CONSUMES_SELF = CursorKind(423)
++CursorKind.NS_CONSUMED = CursorKind(424)
++CursorKind.OBJC_EXCEPTION = CursorKind(425)
++CursorKind.OBJC_NSOBJECT = CursorKind(426)
++CursorKind.OBJC_INDEPENDENT_CLASS = CursorKind(427)
++CursorKind.OBJC_PRECISE_LIFETIME = CursorKind(428)
++CursorKind.OBJC_RETURNS_INNER_POINTER = CursorKind(429)
++CursorKind.OBJC_REQUIRES_SUPER = CursorKind(430)
++CursorKind.OBJC_ROOT_CLASS = CursorKind(431)
++CursorKind.OBJC_SUBCLASSING_RESTRICTED = CursorKind(432)
++CursorKind.OBJC_EXPLICIT_PROTOCOL_IMPL = CursorKind(433)
++CursorKind.OBJC_DESIGNATED_INITIALIZER = CursorKind(434)
++CursorKind.OBJC_RUNTIME_VISIBLE = CursorKind(435)
++CursorKind.OBJC_BOXABLE = CursorKind(436)
++CursorKind.FLAG_ENUM = CursorKind(437)
+ CursorKind.CONVERGENT_ATTR = CursorKind(438)
+ CursorKind.WARN_UNUSED_ATTR = CursorKind(439)
+ CursorKind.WARN_UNUSED_RESULT_ATTR = CursorKind(440)
+@@ -1395,6 +1544,11 @@ class TemplateArgumentKind(BaseEnumeration):
+ TemplateArgumentKind.DECLARATION = TemplateArgumentKind(2)
+ TemplateArgumentKind.NULLPTR = TemplateArgumentKind(3)
+ TemplateArgumentKind.INTEGRAL = TemplateArgumentKind(4)
++TemplateArgumentKind.TEMPLATE = TemplateArgumentKind(5)
++TemplateArgumentKind.TEMPLATE_EXPANSION = TemplateArgumentKind(6)
++TemplateArgumentKind.EXPRESSION = TemplateArgumentKind(7)
++TemplateArgumentKind.PACK = TemplateArgumentKind(8)
++TemplateArgumentKind.INVALID = TemplateArgumentKind(9)
+ 
+ ### Exception Specification Kinds ###
+ class ExceptionSpecificationKind(BaseEnumeration):
+@@ -2240,8 +2394,26 @@ def __repr__(self):
+ TypeKind.OCLQUEUE = TypeKind(159)
+ TypeKind.OCLRESERVEID = TypeKind(160)
+ 
++TypeKind.OBJCOBJECT = TypeKind(161)
++TypeKind.OBJCCLASS = TypeKind(162)
++TypeKind.ATTRIBUTED = TypeKind(163)
++
++TypeKind.OCLINTELSUBGROUPAVCMCEPAYLOAD = TypeKind(164)
++TypeKind.OCLINTELSUBGROUPAVCIMEPAYLOAD = TypeKind(165)
++TypeKind.OCLINTELSUBGROUPAVCREFPAYLOAD = TypeKind(166)
++TypeKind.OCLINTELSUBGROUPAVCSICPAYLOAD = TypeKind(167)
++TypeKind.OCLINTELSUBGROUPAVCMCERESULT = TypeKind(168)
++TypeKind.OCLINTELSUBGROUPAVCIMERESULT = TypeKind(169)
++TypeKind.OCLINTELSUBGROUPAVCREFRESULT = TypeKind(170)
++TypeKind.OCLINTELSUBGROUPAVCSICRESULT = TypeKind(171)
++TypeKind.OCLINTELSUBGROUPAVCIMERESULTSINGLEREFERENCESTREAMOUT = TypeKind(172)
++TypeKind.OCLINTELSUBGROUPAVCIMERESULTSDUALREFERENCESTREAMOUT = TypeKind(173)
++TypeKind.OCLINTELSUBGROUPAVCIMERESULTSSINGLEREFERENCESTREAMIN = TypeKind(174)
++TypeKind.OCLINTELSUBGROUPAVCIMEDUALREFERENCESTREAMIN = TypeKind(175)
++
+ TypeKind.EXTVECTOR = TypeKind(176)
+ TypeKind.ATOMIC = TypeKind(177)
++TypeKind.BTFTAGATTRIBUTED = TypeKind(178)
+ 
+ class RefQualifierKind(BaseEnumeration):
+     """Describes a specific ref-qualifier of a type."""
+diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h
+index 3f3620609b6dd..60db3cf0966c0 100644
+--- a/clang/include/clang-c/Index.h
++++ b/clang/include/clang-c/Index.h
+@@ -1675,7 +1675,7 @@ enum CXCursorKind {
+   CXCursor_ConceptSpecializationExpr = 153,
+ 
+   /**
+-   * Expression that references a C++20 concept.
++   * Expression that references a C++20 requires expression.
+    */
+   CXCursor_RequiresExpr = 154,
+ 
diff --git a/packages/llvm/package.py b/packages/llvm/package.py
index b437b0ee..a0b9bd0e 100644
--- a/packages/llvm/package.py
+++ b/packages/llvm/package.py
@@ -548,6 +548,22 @@ class Llvm(CMakePackage, CudaPackage, LlvmDetection, CompilerPackage):
         sha256="c6ca6b925f150e8644ce756023797b7f94c9619c62507231f979edab1c09af78",
         when="@6:13",
     )
+
+    # begin EBRAINS
+    # add missing concept declaration CursorKind to clang's Python bindings
+    patch(
+        "https://github.com/llvm/llvm-project/commit/8b322895207c34b434698954dc67404e0bbf8d8e.patch?full_index=1",
+        sha256="173050a7f08c01bbc18d1145f455cac827754d0436befc2afd1add86e884fac0",
+        when="@15:16",
+    )
+    # Add some Kinds existing in Index.h but missing in cindex.py (dropped release note changes)
+    patch(
+        # based on https://github.com/llvm/llvm-project/commit/eb264d825beb048c6e673ddaf5aca069511fcfb3.patch?full_index=1
+        "llvm15-clang-python-missing-kinds.patch",
+        when="@15:18",
+    )
+    # end EBRAINS
+
     # fix building of older versions of llvm with newer versions of glibc
     for compiler_rt_as in ["project", "runtime"]:
         with when("compiler-rt={0}".format(compiler_rt_as)):
-- 
GitLab