Skip to content

Commit

Permalink
Clang 19 updated tests and switched.
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasfertig committed Jan 11, 2025
1 parent 66cf8b2 commit 33f99fd
Show file tree
Hide file tree
Showing 39 changed files with 261 additions and 200 deletions.
62 changes: 31 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
env:
CMAKE_VERSION: 3.29.0
NINJA_VERSION: 1.11.1
LLVM_VERSION: 18.1.0
LLVM_VERSION: 19.1.0
NINJA_STATUS: "[%f/%t %o/sec] "

jobs:
Expand All @@ -32,7 +32,7 @@ jobs:
name: "Linux Clang - Format check",
os: ubuntu-20.04,
build_type: Release,
cformat_name: 'clang-format-18'
cformat_name: 'clang-format-19'
}

steps:
Expand All @@ -45,7 +45,7 @@ jobs:
run: |
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 18
sudo ./llvm.sh 19
sudo apt-get install ${{ matrix.config.cformat_name }}
- name: clang-format check
Expand All @@ -68,11 +68,11 @@ jobs:
config:
# AppleClang
- {
name: "Clang 18 / LLVM 18 @ macOS Release",
name: "Clang 19 / LLVM 19 @ macOS Release",
os: macos-14,
build_type: Release,
cxx: "clang++",
llvm_version: "18.1.0",
llvm_version: "19.1.0",
llvm_config: "llvm-config",
coverage: "No",
static: "No",
Expand All @@ -87,11 +87,11 @@ jobs:

# AppleClang
- {
name: "Clang 18 / LLVM 18 @ macOS Debug",
name: "Clang 19 / LLVM 19 @ macOS Debug",
os: macos-14,
build_type: Release,
cxx: "clang++",
llvm_version: "18.1.0",
llvm_version: "19.1.0",
llvm_config: "llvm-config",
coverage: "No",
static: "No",
Expand All @@ -106,11 +106,11 @@ jobs:

# AppleClang
- {
name: "Clang 18 / LLVM 18 @ macOS Coverage & Debug",
name: "Clang 19 / LLVM 19 @ macOS Coverage & Debug",
os: macos-14,
build_type: Release,
cxx: "clang++",
llvm_version: "18.1.0",
llvm_version: "19.1.0",
llvm_config: "llvm-config",
coverage: "Yes",
static: "No",
Expand All @@ -124,11 +124,11 @@ jobs:

# # MSVC 2019
# - {
# name: "MSVC 2022 / LLVM 18 @ Windows Release",
# name: "MSVC 2022 / LLVM 19 @ Windows Release",
# os: windows-2022,
# build_type: Release,
# cxx: "cl",
# llvm_version: "18.1.0",
# llvm_version: "19.1.0",
# llvm_config: "current/bin/llvm-config.exe",
# static: "Yes",
# debug: "No",
Expand All @@ -143,11 +143,11 @@ jobs:

# # MSVC 2019
# - {
# name: "MSVC 2022 / LLVM 18 @ Windows Debug",
# name: "MSVC 2022 / LLVM 19 @ Windows Debug",
# os: windows-2022,
# build_type: Release,
# cxx: "cl",
# llvm_version: "18.1.0",
# llvm_version: "19.1.0",
# llvm_config: "current/bin/llvm-config.exe",
# static: "Yes",
# debug: "Yes",
Expand All @@ -161,11 +161,11 @@ jobs:

# # MSVC 2019
# - {
# name: "MSVC 2022 / LLVM 18 @ Windows Code Coverage & Debug",
# name: "MSVC 2022 / LLVM 19 @ Windows Code Coverage & Debug",
# os: windows-2022,
# build_type: Release,
# cxx: "clang-cl.exe",
# llvm_version: "18.1.0",
# llvm_version: "19.1.0",
# llvm_config: "current/bin/llvm-config.exe",
# coverage: "Yes",
# static: "Yes",
Expand Down Expand Up @@ -460,13 +460,13 @@ jobs:
- amd64

config:
# GCC 13 / LLVM 18
# GCC 13 / LLVM 19
- {
name: "GCC 13 / LLVM 18 @ Ubuntu Release",
name: "GCC 13 / LLVM 19 @ Ubuntu Release",
build_type: Release,
cxx: "g++-13",
llvm_version: "18.1.0",
llvm_config: "/usr/bin/llvm-config-18",
llvm_version: "19.1.0",
llvm_config: "/usr/bin/llvm-config-19",
coverage: "No",
static: "Yes",
debug: "No",
Expand All @@ -479,13 +479,13 @@ jobs:
docs: "Yes",
}

# GCC 13 / LLVM 18
# GCC 13 / LLVM 19
- {
name: "GCC 13 / LLVM 18 @ Ubuntu Code Coverage & Debug",
name: "GCC 13 / LLVM 19 @ Ubuntu Code Coverage & Debug",
build_type: Release,
cxx: "g++-13",
llvm_version: "18.1.0",
llvm_config: "/usr/bin/llvm-config-18",
llvm_version: "19.1.0",
llvm_config: "/usr/bin/llvm-config-19",
coverage: "Yes",
static: "No",
debug: "Yes",
Expand All @@ -496,13 +496,13 @@ jobs:
archive_name: "insights-ubuntu",
}

# GCC 13 / LLVM 18
# GCC 13 / LLVM 19
- {
name: "GCC 13 / LLVM 18 @ Ubuntu Code Coverage (libc++)",
name: "GCC 13 / LLVM 19 @ Ubuntu Code Coverage (libc++)",
build_type: Release,
cxx: "g++-13",
llvm_version: "18.1.0",
llvm_config: "/usr/bin/llvm-config-18",
llvm_version: "19.1.0",
llvm_config: "/usr/bin/llvm-config-19",
coverage: "Yes",
static: "No",
debug: "Yes",
Expand Down Expand Up @@ -649,13 +649,13 @@ jobs:
- amd64

config:
# GCC 13 / LLVM 18
# GCC 13 / LLVM 19
- {
name: "GCC 13 / LLVM 18 @ Ubuntu Release",
name: "GCC 13 / LLVM 19 @ Ubuntu Release",
build_type: Release,
cxx: "g++-13",
llvm_version: "18.1.0",
llvm_config: "/usr/bin/llvm-config-18",
llvm_version: "19.1.0",
llvm_config: "/usr/bin/llvm-config-19",
coverage: "No",
static: "Yes",
debug: "No",
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ option(INSIGHTS_STATIC "Use static linking" Off)

set(INSIGHTS_LLVM_CONFIG "llvm-config" CACHE STRING "LLVM config executable to use")

set(INSIGHTS_MIN_LLVM_MAJOR_VERSION 18)
set(INSIGHTS_MIN_LLVM_MAJOR_VERSION 19)
set(INSIGHTS_MIN_LLVM_VERSION ${INSIGHTS_MIN_LLVM_MAJOR_VERSION}.0)

if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
Expand Down
2 changes: 1 addition & 1 deletion scripts/prepare-release.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def main():

oldClangStable = '18'
newClangStable = '19'
newInsightsVersion = f'{newClangStable}.0'
newInsightsVersion = f'{newClangStable}.1'
oldInsightsVersion = re.search(r'INSIGHTS_VERSION\s+"(.*?)"', versionH, re.DOTALL | re.MULTILINE).group(1)


Expand Down
2 changes: 1 addition & 1 deletion tests/DependentScopeDeclRefExprTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct A;
template <typename T>
void test() {
A<T>::foo;
A<T>::template foo;
//A<T>::template foo; // Invalid since Clang 19
A<T>::template foo<>;
A<T>::template foo<T>;
}
Expand Down
1 change: 0 additions & 1 deletion tests/DependentScopeDeclRefExprTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ namespace DependentScopeDeclRefExpr
void test()
{
A<T>::foo;
A<T>::template foo;
A<T>::template foo<>;
A<T>::template foo<T>;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/EduCfrontTest17.cerr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| ;
.tmp.cpp:9:1: warning: typedef requires a name [-Wmissing-declarations]
9 | typedef struct Foo
| ^~~~~~~
| ^~~~~~~~~~~~~~~~~~
.tmp.cpp:12:3: warning: declaration does not declare anything [-Wmissing-declarations]
12 | } Foo;
| ^~~
Expand Down
2 changes: 1 addition & 1 deletion tests/EduCfrontTest21.cerr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
| ;
.tmp.cpp:11:1: warning: typedef requires a name [-Wmissing-declarations]
11 | typedef struct Foo
| ^~~~~~~
| ^~~~~~~~~~~~~~~~~~
.tmp.cpp:15:3: warning: declaration does not declare anything [-Wmissing-declarations]
15 | } Foo;
| ^~~
Expand Down
2 changes: 1 addition & 1 deletion tests/EduCoroutineAllocFailureTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ void __fun_intDestroy(__fun_intFrame * __f)
__f->~__fun_intFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__fun_intFrame));
}

#endif
Expand Down
2 changes: 1 addition & 1 deletion tests/EduCoroutineBinaryExprTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void __seqDestroy(__seqFrame * __f)
__f->~__seqFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__seqFrame));
}


Expand Down
2 changes: 1 addition & 1 deletion tests/EduCoroutineCaptureConstTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void __seqDestroy(__seqFrame * __f)
__f->~__seqFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__seqFrame));
}


Expand Down
2 changes: 1 addition & 1 deletion tests/EduCoroutineCaptureThisTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ inline my_resumable coro(int x)
__f->~__coroFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__coroFrame));
}


Expand Down
4 changes: 2 additions & 2 deletions tests/EduCoroutineCoAwaitOperatorTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ void __gResume(__gFrame * __f)
__f->__suspend_56_14_res = __f->__suspend_56_14.await_resume();
__f->__suspend_56_14_res;
/* co_return EduCoroutineCoAwaitOperatorTest.cpp:51 */
__f->__promise.return_void();
__f->__promise.return_void()/* implicit */;
goto __final_suspend;
} catch(...) {
if(!__f->__initial_await_suspend_called) {
Expand Down Expand Up @@ -280,6 +280,6 @@ void __gDestroy(__gFrame * __f)
__f->~__gFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__gFrame));
}

8 changes: 4 additions & 4 deletions tests/EduCoroutineCoreturnWithCoawaitTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void __simpleReturnDestroy(__simpleReturnFrame * __f)
__f->~__simpleReturnFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__simpleReturnFrame));
}


Expand Down Expand Up @@ -327,7 +327,7 @@ void __additionAwaitReturnDestroy(__additionAwaitReturnFrame * __f)
__f->~__additionAwaitReturnFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__additionAwaitReturnFrame));
}


Expand Down Expand Up @@ -474,7 +474,7 @@ void __additionAwaitReturn2Destroy(__additionAwaitReturn2Frame * __f)
__f->~__additionAwaitReturn2Frame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__additionAwaitReturn2Frame));
}


Expand Down Expand Up @@ -607,7 +607,7 @@ void __additionAwaitReturnWithIntDestroy(__additionAwaitReturnWithIntFrame * __f
__f->~__additionAwaitReturnWithIntFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__additionAwaitReturnWithIntFrame));
}


Expand Down
4 changes: 2 additions & 2 deletions tests/EduCoroutineCustomYieldTypeTest.expect
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ void __seqResume(__seqFrame * __f)
}

/* co_return EduCoroutineCustomYieldTypeTest.cpp:86 */
__f->__promise.return_void();
__f->__promise.return_void()/* implicit */;
goto __final_suspend;
} catch(...) {
if(!__f->__initial_await_suspend_called) {
Expand Down Expand Up @@ -270,7 +270,7 @@ void __seqDestroy(__seqFrame * __f)
__f->~__seqFrame();
/* Deallocating the coroutine frame */
/* Note: The actual argument to delete is __builtin_coro_frame with the promise as parameter */
operator delete(static_cast<void *>(__f));
operator delete(static_cast<void *>(__f), sizeof(__seqFrame));
}


Expand Down
Loading

0 comments on commit 33f99fd

Please sign in to comment.