diff --git a/Cargo.lock b/Cargo.lock index b1b557d7c5..f3b9a54040 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1195,25 +1195,25 @@ dependencies = [ [[package]] name = "inkwell" version = "0.1.0" -source = "git+https://github.com/rtfeldman/inkwell?tag=llvm10-0.release2#d0a1ce5e678cf0f0e62b757760d1019301c603c9" +source = "git+https://github.com/rtfeldman/inkwell?tag=llvm10-0.release3#57e9f00d98fc99486e737c314e56a59498c5dbbb" dependencies = [ "either", "inkwell_internals", "libc", "llvm-sys", "once_cell", - "parking_lot 0.10.2", + "parking_lot 0.11.0", "regex", ] [[package]] name = "inkwell_internals" -version = "0.1.0" -source = "git+https://github.com/rtfeldman/inkwell?tag=llvm10-0.release2#d0a1ce5e678cf0f0e62b757760d1019301c603c9" +version = "0.2.0" +source = "git+https://github.com/rtfeldman/inkwell?tag=llvm10-0.release3#57e9f00d98fc99486e737c314e56a59498c5dbbb" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "proc-macro2 1.0.21", + "quote 1.0.7", + "syn 1.0.40", ] [[package]] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4ddc752022..e37bc8781c 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -77,7 +77,7 @@ libloading = "0.6" # commit of TheDan64/inkwell, push a new tag which points to the latest commit, # change the tag value in this Cargo.toml to point to that tag, and `cargo update`. # This way, GitHub Actions works and nobody's builds get broken. -inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release2" } +inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release3" } target-lexicon = "0.10" [dev-dependencies] diff --git a/compiler/build/Cargo.toml b/compiler/build/Cargo.toml index d178dee1d7..a2a0eea088 100644 --- a/compiler/build/Cargo.toml +++ b/compiler/build/Cargo.toml @@ -45,7 +45,7 @@ tempfile = "3.1.0" # commit of TheDan64/inkwell, push a new tag which points to the latest commit, # change the tag value in this Cargo.toml to point to that tag, and `cargo update`. # This way, GitHub Actions works and nobody's builds get broken. -inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release2" } +inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release3" } target-lexicon = "0.10" [dev-dependencies] diff --git a/compiler/gen/Cargo.toml b/compiler/gen/Cargo.toml index f87447f23f..41420c9056 100644 --- a/compiler/gen/Cargo.toml +++ b/compiler/gen/Cargo.toml @@ -39,7 +39,7 @@ either = "1.6.1" # commit of TheDan64/inkwell, push a new tag which points to the latest commit, # change the tag value in this Cargo.toml to point to that tag, and `cargo update`. # This way, GitHub Actions works and nobody's builds get broken. -inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release2" } +inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release3" } target-lexicon = "0.10" libloading = "0.6" diff --git a/compiler/gen/src/llvm/build_list.rs b/compiler/gen/src/llvm/build_list.rs index 7ef5bd1593..77ee9909bc 100644 --- a/compiler/gen/src/llvm/build_list.rs +++ b/compiler/gen/src/llvm/build_list.rs @@ -185,7 +185,9 @@ pub fn list_prepend<'a, 'ctx, 'env>( // one we just malloc'd. // // TODO how do we decide when to do the small memcpy vs the normal one? - builder.build_memcpy(index_1_ptr, ptr_bytes, list_ptr, ptr_bytes, list_size); + builder + .build_memcpy(index_1_ptr, ptr_bytes, list_ptr, ptr_bytes, list_size) + .unwrap(); } else { panic!("TODO Cranelift currently only knows how to clone list elements that are Copy."); } @@ -626,7 +628,9 @@ pub fn list_append<'a, 'ctx, 'env>( // one we just malloc'd. // // TODO how do we decide when to do the small memcpy vs the normal one? - builder.build_memcpy(clone_ptr, ptr_bytes, list_ptr, ptr_bytes, list_size); + builder + .build_memcpy(clone_ptr, ptr_bytes, list_ptr, ptr_bytes, list_size) + .unwrap(); } else { panic!("TODO Cranelift currently only knows how to clone list elements that are Copy."); } @@ -1816,7 +1820,9 @@ pub fn clone_nonempty_list<'a, 'ctx, 'env>( // one we just malloc'd. // // TODO how do we decide when to do the small memcpy vs the normal one? - builder.build_memcpy(clone_ptr, ptr_bytes, elems_ptr, ptr_bytes, size); + builder + .build_memcpy(clone_ptr, ptr_bytes, elems_ptr, ptr_bytes, size) + .unwrap(); } else { panic!("TODO Cranelift currently only knows how to clone list elements that are Copy."); } @@ -1872,7 +1878,9 @@ pub fn clone_list<'a, 'ctx, 'env>( ); // copy old elements in - builder.build_memcpy(new_ptr, ptr_bytes, old_ptr, ptr_bytes, bytes); + builder + .build_memcpy(new_ptr, ptr_bytes, old_ptr, ptr_bytes, bytes) + .unwrap(); new_ptr } diff --git a/compiler/gen/src/llvm/build_str.rs b/compiler/gen/src/llvm/build_str.rs index 77c13c282f..24b18a5943 100644 --- a/compiler/gen/src/llvm/build_str.rs +++ b/compiler/gen/src/llvm/build_str.rs @@ -537,7 +537,9 @@ fn clone_nonempty_str<'a, 'ctx, 'env>( // Copy the bytes from the original array into the new // one we just malloc'd. - builder.build_memcpy(clone_ptr, ptr_bytes, bytes_ptr, ptr_bytes, len); + builder + .build_memcpy(clone_ptr, ptr_bytes, bytes_ptr, ptr_bytes, len) + .unwrap(); // Create a fresh wrapper struct for the newly populated array let struct_type = collection(ctx, env.ptr_bytes); diff --git a/editor/Cargo.toml b/editor/Cargo.toml index eaa6f140b8..b39514dd02 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -47,7 +47,7 @@ tokio = { version = "0.2", features = ["blocking", "fs", "sync", "rt-threaded", # commit of TheDan64/inkwell, push a new tag which points to the latest commit, # change the tag value in this Cargo.toml to point to that tag, and `cargo update`. # This way, GitHub Actions works and nobody's builds get broken. -inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release2" } +inkwell = { git = "https://github.com/rtfeldman/inkwell", tag = "llvm10-0.release3" } target-lexicon = "0.10" winit = "0.22" wgpu = "0.6"