Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ jobs:
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
python-version: '3.13'
- name: ubu24-arm-gcc12-clang-repl-19-cppyy
os: ubuntu-24.04-arm
compiler: gcc-12
clang-runtime: '19'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
python-version: '3.12'
- name: ubu24-arm-gcc14-clang20-cling-cppyy
os: ubuntu-24.04-arm
compiler: gcc-14
Expand Down Expand Up @@ -95,14 +87,6 @@ jobs:
oop-jit: On
coverage: true
python-version: '3.13'
- name: ubu24-x86-gcc12-clang-repl-19-cppyy
os: ubuntu-24.04
compiler: gcc-12
clang-runtime: '19'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
python-version: '3.12'
- name: ubu24-x86-gcc14-clang20-cling-cppyy
os: ubuntu-24.04
compiler: gcc-14
Expand Down Expand Up @@ -137,15 +121,6 @@ jobs:
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
python-version: '3.13'
- name: osx26-arm-clang-clang-repl-19-cppyy
os: macos-26
compiler: clang
clang-runtime: '19'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
python-version: '3.12'
- name: osx26-arm-clang-clang20-cling-cppyy
os: macos-26
compiler: clang
Expand All @@ -172,15 +147,6 @@ jobs:
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
python-version: '3.13'
- name: osx15-x86-clang-clang-repl-19-cppyy
os: macos-15-intel
compiler: clang
clang-runtime: '19'
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
python-version: '3.12'
- name: osx15-x86-clang-clang20-cling-cppyy
os: macos-15-intel
compiler: clang
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
include(GNUInstallDirs)
## Define supported version of clang and llvm

set(CLANG_MIN_SUPPORTED 19.0)
set(CLANG_MIN_SUPPORTED 20.0)
set(CLANG_MAX_SUPPORTED "21.1.x")
set(CLANG_VERSION_UPPER_BOUND 22.0.0)
set(LLD_MIN_SUPPORTED 19.0)
set(LLD_MIN_SUPPORTED 20.0)
set(LLD_MAX_SUPPORTED "21.1.x")
set(LLD_VERSION_UPPER_BOUND 22.0.0)
set(LLVM_MIN_SUPPORTED 19.0)
set(LLVM_MIN_SUPPORTED 20.0)
set(LLVM_MAX_SUPPORTED "21.1.x")
set(LLVM_VERSION_UPPER_BOUND 22.0.0)

Expand Down
8 changes: 0 additions & 8 deletions lib/CppInterOp/Compatibility.h
Original file line number Diff line number Diff line change
Expand Up @@ -452,19 +452,11 @@ inline void InstantiateClassTemplateSpecialization(
#ifdef CPPINTEROP_USE_CLING
cling::Interpreter::PushTransactionRAII RAII(&interp);
#endif
#if CLANG_VERSION_MAJOR < 20
interp.getSema().InstantiateClassTemplateSpecialization(
clang::SourceLocation::getFromRawEncoding(1), CTSD,

clang::TemplateSpecializationKind::TSK_ExplicitInstantiationDefinition,
/*Complain=*/true);
#else
interp.getSema().InstantiateClassTemplateSpecialization(
clang::SourceLocation::getFromRawEncoding(1), CTSD,
clang::TemplateSpecializationKind::TSK_ExplicitInstantiationDefinition,
/*Complain=*/true,
/*PrimaryHasMatchedPackOnParmToNonPackOnArg=*/false);
#endif
}
} // namespace compat

Expand Down
4 changes: 1 addition & 3 deletions lib/CppInterOp/CppInterOp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Demangle/Demangle.h"
#if CLANG_VERSION_MAJOR >= 20
#include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h"
#include "llvm/ExecutionEngine/Orc/CoreContainers.h"
#endif
#include "llvm/ExecutionEngine/Orc/Core.h"
#include "llvm/ExecutionEngine/Orc/CoreContainers.h"
#include "llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/Support/Casting.h"
Expand Down
26 changes: 0 additions & 26 deletions lib/CppInterOp/Paths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,32 +178,6 @@ void CopyIncludePaths(const clang::HeaderSearchOptions& Opts,
if (withFlags)
incpaths.push_back("-isystem");
break;
// Option was removed in llvm 20. Git log message below.
// git log --grep="index-header"
// commit 19b4f17d4c0ae12725050d09f04f85bccc686d8e
// Author: Jan Svoboda <jan_svoboda@apple.com>
// Date: Thu Oct 31 16:04:35 2024 -0700
//
// [clang][lex] Remove `-index-header-map` (#114459)
//
// This PR removes the `-index-header-map` functionality from Clang.
// AFAIK this was only used internally at Apple and is now dead code.
// The main motivation behind this change is to enable the removal of
// `HeaderFileInfo::Framework` member and reducing the size of that
// data structure.
//
// rdar://84036149

#if CLANG_VERSION_MAJOR < 20
case frontend::IndexHeaderMap:
if (!withSystem)
continue;
if (withFlags)
incpaths.push_back("-index-header-map");
if (withFlags)
incpaths.push_back(E.IsFramework ? "-F" : "-I");
break;
#endif

case frontend::CSystem:
if (!withSystem)
Expand Down

This file was deleted.

13 changes: 0 additions & 13 deletions patches/llvm/emscripten-clang19-3-remove-zdefs.patch

This file was deleted.

67 changes: 0 additions & 67 deletions patches/llvm/emscripten-clang19-4-enable_exception_handling.patch

This file was deleted.

4 changes: 0 additions & 4 deletions unittests/CppInterOp/DynamicLibraryManagerTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, DynamicLibraryManager_Sanity) {
TYPED_TEST(CPPINTEROP_TEST_MODE, DynamicLibraryManager_BasicSymbolLookup) {
#ifndef EMSCRIPTEN
GTEST_SKIP() << "This test is only intended for Emscripten builds.";
#else
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Support for loading shared libraries was added in LLVM 20.";
#endif
#endif
if (TypeParam::isOutOfProcess)
GTEST_SKIP() << "Test fails for OOP JIT builds";
Expand Down
30 changes: 0 additions & 30 deletions unittests/CppInterOp/FunctionReflectionTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1549,11 +1549,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_IsStaticMethod) {
}

TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_GetFunctionAddress) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
if (llvm::sys::RunningOnValgrind())
GTEST_SKIP() << "XFAIL due to Valgrind report";
#ifdef _WIN32
Expand Down Expand Up @@ -1623,11 +1618,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_IsVirtualMethod) {
}

TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_JitCallAdvanced) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
#if CLANG_VERSION_MAJOR == 20 && defined(CPPINTEROP_USE_CLING) && defined(_WIN32)
GTEST_SKIP() << "Test fails with Cling on Windows";
#endif
Expand Down Expand Up @@ -1677,11 +1667,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_JitCallAdvanced) {
#if !defined(NDEBUG) && GTEST_HAS_DEATH_TEST
#ifndef _WIN32 // Death tests do not work on Windows
TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_JitCallDebug) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
if (llvm::sys::RunningOnValgrind())
GTEST_SKIP() << "XFAIL due to Valgrind report";

Expand Down Expand Up @@ -2441,11 +2426,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_GetFunctionArgDefault) {
}

TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_Construct) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
if (llvm::sys::RunningOnValgrind())
GTEST_SKIP() << "XFAIL due to Valgrind report";
#ifdef _WIN32
Expand Down Expand Up @@ -2524,11 +2504,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_Construct) {

// Test zero initialization of PODs and default initialization cases
TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_ConstructPOD) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
if (llvm::sys::RunningOnValgrind())
GTEST_SKIP() << "XFAIL due to Valgrind report";
#ifdef _WIN32
Expand Down Expand Up @@ -2569,11 +2544,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_ConstructPOD) {

// Test nested constructor calls
TYPED_TEST(CPPINTEROP_TEST_MODE, FunctionReflection_ConstructNested) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
if (llvm::sys::RunningOnValgrind())
GTEST_SKIP() << "XFAIL due to Valgrind report";
#ifdef _WIN32
Expand Down
5 changes: 0 additions & 5 deletions unittests/CppInterOp/VariableReflectionTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,6 @@ TYPED_TEST(CPPINTEROP_TEST_MODE, VariableReflection_GetVariableType) {
CODE

TYPED_TEST(CPPINTEROP_TEST_MODE, VariableReflection_GetVariableOffset) {
#ifdef EMSCRIPTEN
#if CLANG_VERSION_MAJOR < 20
GTEST_SKIP() << "Test fails for Emscipten builds";
#endif
#endif
std::vector<Decl *> Decls;
#define Stringify(s) Stringifyx(s)
#define Stringifyx(...) #__VA_ARGS__
Expand Down
Loading