Merge branch 'develop' into _update-deps/runtimeverification/hs-backe…

…nd-booster
runtimeverification · Nov 3, 2023 · 1150d04 · 1150d04
2 parents 92a80f7 + b1b22ea
commit 1150d04
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -102,7 +102,7 @@ jobs:
         with:
           os: ubuntu
           distro: jammy
-          llvm: 14
+          llvm: 15
           pkg-name: kframework_amd64_ubuntu_jammy.deb
           build-package: package/debian/build-package jammy
           test-package: package/debian/test-package
@@ -349,7 +349,7 @@ jobs:
           tag: k-release-ci-${{ github.sha }}
           os: ubuntu
           distro: jammy
-          llvm: 14
+          llvm: 15
 
       - name: 'Push Maven Packages'
         shell: bash {0}

diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -109,7 +109,7 @@ jobs:
           tag: k-ci-${{ github.sha }}
           os: ubuntu
           distro: jammy
-          llvm: 14
+          llvm: 15
       - name: 'Build and Test K'
         run: docker exec -t k-ci-${GITHUB_SHA} /bin/bash -c 'mvn verify --batch-mode -U'
       - name: 'Check out k-exercises'
@@ -142,7 +142,7 @@ jobs:
         with:
           os: ubuntu
           distro: jammy
-          llvm: 14
+          llvm: 15
           build-package: package/debian/build-package jammy
           test-package: package/debian/test-package
       - name: On Failure, Upload the kore-exec.tar.gz file to the Summary Page

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -34,7 +34,7 @@
     let
       allOverlays = [
         (_: _: {
-          llvm-version = 13;
+          llvm-version = 15;
           llvm-backend-build-type = "Release"; })
         mavenix.overlay
         llvm-backend.overlays.default

diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
diff --git a/package/debian/control.jammy b/package/debian/control.jammy
@@ -2,15 +2,15 @@ Source: kframework
 Section: devel
 Priority: optional
 Maintainer: Dwight Guth <[email protected]>
-Build-Depends: clang-14 , cmake , debhelper (>=10) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev
+Build-Depends: clang-15 , cmake , debhelper (>=10) , flex , libboost-test-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-dev , libyaml-dev , maven , openjdk-17-jdk , pkg-config , python3 , python3-dev , python3-distutils , python3-pip , zlib1g-dev
 Standards-Version: 3.9.6
 Homepage: https://github.com/runtimeverification/k
 
 Package: kframework
 Architecture: any
 Section: devel
 Priority: optional
-Depends: bison , clang-14 , openjdk-17-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-0 , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-14 , llvm-14 , pkg-config
+Depends: bison , clang-15 , openjdk-17-jre-headless , flex , gcc , g++ , libboost-dev , libffi-dev , libfmt-dev , libgmp-dev , libjemalloc-dev , libmpfr-dev , libsecp256k1-0 , libtinfo-dev , libyaml-0-2 , libz3-4 , lld-15 , llvm-15 , pkg-config
 Recommends: z3
 Description: K framework toolchain
  Includes K Framework compiler for K language definitions, and K interpreter
+5 −4		INSTALL.md
+2 −14		cmake/FindLLVM.cmake
+1 −1		default.nix
+8 −8		flake.nix
+10 −15		include/kllvm/codegen/Util.h
+2 −16		lib/codegen/ApplyPasses.cpp
+37 −19		lib/codegen/CreateStaticTerm.cpp
+30 −22		lib/codegen/CreateTerm.cpp
+0 −5		lib/codegen/Debug.cpp
+15 −14		lib/codegen/Decision.cpp
+6 −3		lib/codegen/DecisionParser.cpp
+23 −11		lib/codegen/EmitConfigParser.cpp
+0 −19		lib/codegen/Util.cpp