Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: update clang/LLVM to version 16.0.6 #191

Merged
merged 18 commits into from
Nov 7, 2023
Merged
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
12 changes: 6 additions & 6 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ubuntu@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f

ARG BATS_VERSION=1.10.0
ARG CCACHE_VERSION=4.8.3
ARG CLANG_VERSION=15
ARG CLANG_VERSION=16
ARG DOCKER_VERSION=24.0.6
ARG MULL_VERSION=0.20.0
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.19
ARG MULL_VERSION=main
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.20
ARG XWIN_VERSION=0.3.1

ARG DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -48,11 +48,11 @@ ENV PATH="$PATH:/usr/lib/llvm-${CLANG_VERSION}/bin"
# hadolint ignore=DL3008
RUN apt-get update && apt-get install -y --no-install-recommends libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev libsqlite3-dev \
&& wget -qO - https://github.com/include-what-you-use/include-what-you-use/archive/refs/tags/${INCLUDE_WHAT_YOU_USE_VERSION}.tar.gz | tar xz -C /tmp \
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -S /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} -B /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build \
&& CC=clang CXX=clang++ cmake -S /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} -B /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build \
&& cmake --build /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build --target install \
&& rm -rf /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} \
&& git -C /tmp clone --recurse-submodules -b ${MULL_VERSION} https://github.com/mull-project/mull.git \
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -S /tmp/mull -B /tmp/mull/build \
&& CC=clang CXX=clang++ cmake -S /tmp/mull -B /tmp/mull/build \
&& cmake --build /tmp/mull/build --target install \
&& rm -rf /tmp/mull \
&& apt-get purge -y libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev libsqlite3-dev \
Expand All @@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends libclang-${CLAN

# Install ccache from source for a recent version
RUN wget -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -DCMAKE_BUILD_TYPE=Release -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
&& CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
&& cmake --build /tmp/ccache-${CCACHE_VERSION}/build --target install \
&& rm -rf /tmp/ccache-${CCACHE_VERSION}

Expand Down
15 changes: 8 additions & 7 deletions .devcontainer/apt-requirements-clang.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"clang-15": "1:15.0.7-0ubuntu0.22.04.3",
"clangd-15": "1:15.0.7-0ubuntu0.22.04.3",
"clang-format-15": "1:15.0.7-0ubuntu0.22.04.3",
"clang-tidy-15": "1:15.0.7-0ubuntu0.22.04.3",
"clang-tools-15": "1:15.0.7-0ubuntu0.22.04.3",
"lld-15": "1:15.0.7-0ubuntu0.22.04.3",
"llvm-15": "1:15.0.7-0ubuntu0.22.04.3"
"clang-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clangd-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clang-format-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clang-tidy-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clang-tools-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"libclang-rt-16-dev": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"lld-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"llvm-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105"
}
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
// This devcontainer has been set-up to run docker-from-docker scenarios as per
// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/docker-from-docker
"name": "amp-devcontainer",
"build": {
"dockerfile": "Dockerfile",
"context": ".."
Expand Down
5 changes: 4 additions & 1 deletion test/clang-cl/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
int main(int argc, const char* argv[])
#include <iostream>

int main()
{
std::cout << "Hello World!" << std::endl;
return 0;
}
2 changes: 1 addition & 1 deletion test/mutation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (ENABLE_MUTATION_TESTING_TEST)

add_executable(test-mutation EXCLUDE_FROM_ALL test.cpp)
target_compile_options(test-mutation PRIVATE
-g -O0 -grecord-command-line -fprofile-instr-generate -fcoverage-mapping -fexperimental-new-pass-manager -fpass-plugin=/usr/lib/mull-ir-frontend
-g -O0 -grecord-command-line -fprofile-instr-generate -fcoverage-mapping -fpass-plugin=/usr/lib/mull-ir-frontend
)
target_link_libraries(test-mutation PRIVATE gmock_main)
add_test(NAME test-mutation COMMAND mull-runner $<TARGET_FILE:test-mutation>)
Expand Down