update Cling from 6.30

wlav · Nov 6, 2023 · 5660c60 · 5660c60
1 parent 51e55e5
commit 5660c60
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 1,572 deletions.
diff --git a/cling/create_src_directory.py b/cling/create_src_directory.py
@@ -39,7 +39,7 @@ def is_manylinux():
 TARBALL_CACHE_DIR = 'releases'
 ERR_RELEASE_NOT_FOUND = 2
 
-ROOT_VERSION = '6.28.06'
+ROOT_VERSION = '6.30.00'
 
 #
 ## released source pull and copy of Cling
@@ -116,7 +116,7 @@ def apply(self):
 patch_files = ['typedef_of_private', 'optlevel2_forced', 'explicit_template',
                'alias_template', 'incomplete_types', 'clang_printing',
                'improv_load', 'unload', 'pch', 'win64rtti', 'win64s2',
-               'locales', 'build', 'cling_update']
+               'locales', 'build']
 
 if 'linux' in sys.platform:
     patch_files.append('system_dirs')

diff --git a/cling/patches/build.diff b/cling/patches/build.diff
@@ -2,7 +2,7 @@ diff --git a/src/interpreter/CMakeLists.txt b/src/interpreter/CMakeLists.txt
 index 39dc895cce..6d616cb354 100644
 --- a/src/interpreter/CMakeLists.txt
 +++ b/src/interpreter/CMakeLists.txt
-@@ -490,7 +490,8 @@ else()
+@@ -472,7 +472,8 @@ else()
    set(Clang_DIR "${LLVM_BINARY_DIR}/lib/cmake/clang/")
  endif()
 
@@ -16,7 +16,7 @@ diff --git a/src/interpreter/CMakeLists.txt b/src/interpreter/CMakeLists.txt
 index 7002e43f36..dfdf718685 100644
 --- a/src/interpreter/CMakeLists.txt
 +++ b/src/interpreter/CMakeLists.txt
-@@ -513,7 +513,10 @@ if (builtin_cling)
+@@ -495,7 +495,10 @@ if (builtin_cling)
      set(CLING_CXXFLAGS " ${LLVM_DEFS} -DNOMINMAX -D_XKEYCHECK_H")
    else()
      # FIXME: Work hard to remove -Wno-shadow and -Wno-unused-parameter
@@ -32,7 +32,7 @@ diff --git a/src/interpreter/cling/lib/Interpreter/CIFactory.cpp b/src/interpret
 index 1ab35553fa..b7c99ba281 100644
 --- a/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
 +++ b/src/interpreter/cling/lib/Interpreter/CIFactory.cpp
-@@ -432,7 +432,10 @@ namespace {
+@@ -458,7 +458,10 @@ namespace {
        Opts.CXXExceptions = 1;
      }
 

diff --git a/cling/patches/clang_printing.diff b/cling/patches/clang_printing.diff
@@ -1,7 +1,7 @@
-diff --git a/src/interpreter/llvm/src/tools/clang/lib/AST/Decl.cpp b/src/interpreter/llvm/src/tools/clang/lib/AST/Decl.cpp
+diff --git a/src/interpreter/llvm-project/clang/lib/AST/Decl.cpp b/src/interpreter/llvm-project/clang/lib/AST/Decl.cpp
 index 573a98efe9..41995a9a24 100644
---- a/src/interpreter/llvm/src/tools/clang/lib/AST/Decl.cpp
-+++ b/src/interpreter/llvm/src/tools/clang/lib/AST/Decl.cpp
+--- a/src/interpreter/llvm-project/clang/lib/AST/Decl.cpp
++++ b/src/interpreter/llvm-project/clang/lib/AST/Decl.cpp
 @@ -2891,6 +2891,11 @@ unsigned ParmVarDecl::getParameterIndexLarge() const {
  void FunctionDecl::getNameForDiagnostic(
      raw_ostream &OS, const PrintingPolicy &Policy, bool Qualified) const {