Merge remote-tracking branch 'origin/develop'

runtimeverification · Jul 19, 2024 · ae4f104 · ae4f104
2 parents 9722465 + 343c564
commit ae4f104
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/update-deps.yml b/.github/workflows/update-deps.yml
@@ -59,7 +59,7 @@ jobs:
           cd llvm-backend/src/main/native/llvm-backend
           git checkout "${llvm_backend_version}"
           cd -
-          sed -i 's!      url = "github:runtimeverification/llvm-backend/.*";!      url = "github:runtimeverification/llvm-backend/'"${llvm_backend_version}"'";!' flake.nix
+          sed -i 's!    llvm-backend.url = "github:runtimeverification/llvm-backend/.*";!    llvm-backend.url = "github:runtimeverification/llvm-backend/'"${llvm_backend_version}"'";!' flake.nix
           if git add flake.nix llvm-backend/src/main/native/llvm-backend && git commit -m "flake.nix, llvm-backend/src/main/native/llvm-backend: update to version ${llvm_backend_version}"; then
             changed=true
           fi

diff --git a/deps/llvm-backend_release b/deps/llvm-backend_release
@@ -1 +1 @@
-0.1.57
+0.1.59
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "K Framework";
   inputs = {
-    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.56";
+    llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.59";
     haskell-backend = {
       url = "github:runtimeverification/haskell-backend/v0.1.32";
       inputs.rv-utils.follows = "llvm-backend/rv-utils";

diff --git a/llvm-backend/src/main/native/llvm-backend b/llvm-backend/src/main/native/llvm-backend
+21 −5		bin/llvm-kompile-clang
+12 −0		bindings/c/include/kllvm-c/kllvm-c.h
+11 −0		bindings/c/lib.cpp
+1 −1		bindings/core/CMakeLists.txt
+22 −0		bindings/core/src/core.cpp
+2 −1		include/kllvm/ast/AST.h
+8 −0		include/kllvm/bindings/core/core.h
+1 −0		lib/codegen/ApplyPasses.cpp
+1 −1		nix/llvm-backend.nix
+1 −1		package/debian/changelog
+1 −1		package/version
+40 −0		test/c/Inputs/flat-namespace.c
+6,525 −0		test/c/flat-namespace.kore
+14 −0		test/c/k-files/flat-namespace.k
+1 −4		tools/k-rule-apply/CMakeLists.txt
+0 −83		tools/k-rule-apply/auxiliar.h
+30 −46		tools/k-rule-apply/main.cpp
+86 −0		tools/k-rule-apply/shims.cpp
+33 −0		tools/k-rule-apply/shims.h