Skip to content

Update to latest master branch of immer #438

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Oct 15, 2021
Merged

Update to latest master branch of immer #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58f484d
update immer submodule
Oct 15, 2021
abc102b
point immer submodule at our fork for now
Oct 15, 2021
914c266
update llvm backend runtime to work with new API of immer
Oct 15, 2021
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "deps/immer"]
path = deps/immer
url = https://github.com/arximboldi/immer.git
url = https://github.com/runtimeverification/immer.git
[submodule "deps/rapidjson"]
path = deps/rapidjson
url = https://github.com/Tencent/rapidjson
2 changes: 1 addition & 1 deletion deps/immer
Open in desktop
Submodule immer updated 138 files
3 changes: 2 additions & 1 deletion include/runtime/header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ struct KEq {

using list = immer::flex_vector<
KElem, immer::memory_policy<
immer::heap_policy<kore_alloc_heap>, immer::no_refcount_policy>>;
immer::heap_policy<kore_alloc_heap>, immer::no_refcount_policy,
immer::no_lock_policy>>;
using map = immer::map<
KElem, KElem, HashBlock, std::equal_to<KElem>, list::memory_policy>;
using set
Expand Down
10 changes: 6 additions & 4 deletions runtime/collect/migrate_roots.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ extern "C" {
void migrate(block **blockPtr);

void migrateRoots() {
auto &l = list_impl::empty();
migrate_list((void *)&l);
auto &l1 = list_impl::empty_root();
migrate_collection_node((void **)&l1);
auto &l2 = list_impl::empty_tail();
migrate_collection_node((void **)&l2);
auto &s = set_impl::empty();
migrate_set((void *)&s);
migrate_collection_node((void **)&s);
auto &m = map_impl::empty();
migrate_map((void *)&m);
migrate_collection_node((void **)&m);
if (kllvm_randStateInitialized) {
auto &rand = kllvm_randState->_mp_seed->_mp_d;
string *limbs = struct_base(string, data, rand);
Expand Down