From c1c45373a6f59e989dfd4851d4c9e4994a8e4278 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 12 Jan 2023 19:31:03 +0800 Subject: [PATCH] update dependencies --- Cargo.lock | 150 +++++++++++++++---------------- flake.lock | 6 +- flake.nix | 2 +- nac3artiq/src/codegen.rs | 6 +- nac3artiq/src/symbol_resolver.rs | 20 ++--- nac3artiq/src/timeline.rs | 10 +-- nac3core/src/codegen/expr.rs | 10 +-- nac3core/src/codegen/irrt/mod.rs | 2 +- nac3core/src/codegen/mod.rs | 22 ++--- nac3core/src/codegen/stmt.rs | 2 +- nix/windows/default.nix | 2 +- 11 files changed, 114 insertions(+), 118 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a31fa5cb..d5710662 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15,9 +15,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" dependencies = [ "memchr", ] @@ -37,7 +37,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -77,9 +77,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" [[package]] name = "cfg-if" @@ -89,15 +89,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "console" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", - "winapi", + "windows-sys", ] [[package]] @@ -137,9 +136,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", "cfg-if", @@ -150,9 +149,9 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -160,9 +159,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ "cfg-if", ] @@ -280,6 +279,15 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + [[package]] name = "indexmap" version = "1.9.2" @@ -292,14 +300,14 @@ dependencies = [ [[package]] name = "indoc" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adab1eaa3408fb7f0c777a73e7465fd5656136fc93b670eb6df3c88c2c1344e3" +checksum = "da2d6f23ffea9d7e76c53eee25dfb67bcd8fde7f1198b0855350698c9f07c780" [[package]] name = "inkwell" version = "0.1.0" -source = "git+https://github.com/TheDan64/inkwell.git#845270c99ee6268385b79b2e178a872ab4b1b1a8" +source = "git+https://github.com/TheDan64/inkwell.git#3c5d7706861aac0750b4f0c98d6fcf8a91a2ca0a" dependencies = [ "either", "inkwell_internals", @@ -311,8 +319,8 @@ dependencies = [ [[package]] name = "inkwell_internals" -version = "0.5.0" -source = "git+https://github.com/TheDan64/inkwell.git#845270c99ee6268385b79b2e178a872ab4b1b1a8" +version = "0.6.0" +source = "git+https://github.com/TheDan64/inkwell.git#3c5d7706861aac0750b4f0c98d6fcf8a91a2ca0a" dependencies = [ "proc-macro2", "quote", @@ -353,9 +361,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" [[package]] name = "lalrpop" @@ -397,9 +405,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libloading" @@ -457,9 +465,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" dependencies = [ "autocfg", ] @@ -545,19 +553,19 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "parking_lot" @@ -571,9 +579,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" dependencies = [ "cfg-if", "libc", @@ -657,9 +665,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" dependencies = [ "unicode-ident", ] @@ -725,9 +733,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -749,21 +757,19 @@ checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" [[package]] name = "rayon" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -793,9 +799,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -826,15 +832,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" [[package]] name = "scopeguard" @@ -844,24 +850,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "semver" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", @@ -870,9 +876,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.88" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" dependencies = [ "itoa", "ryu", @@ -935,9 +941,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.103" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -975,16 +981,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "test-case" version = "1.2.3" @@ -1000,18 +996,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" dependencies = [ "proc-macro2", "quote", @@ -1081,9 +1077,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-xid" @@ -1099,9 +1095,9 @@ checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "version_check" diff --git a/flake.lock b/flake.lock index 4d2e60b7..09984265 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", + "lastModified": 1673345971, + "narHash": "sha256-4DfFcKLRfVUTyuGrGNNmw37IeIZSoku9tgTVmu/iD98=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "rev": "54644f409ab471e87014bb305eac8c50190bcf48", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 591a76d5..bb10e064 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "inkwell-0.1.0" = "sha256-Gp2NR5O7ICOsuHrrRH8oTG0sFGwZGNwi/6AH7hkoLB0="; + "inkwell-0.1.0" = "sha256-LYW9/KS+tmFR3aUU30D1wTo3+MedXUuavp9Mbf8NCoY="; }; }; passthru.cargoLock = cargoLock; diff --git a/nac3artiq/src/codegen.rs b/nac3artiq/src/codegen.rs index 809b7cc4..8ff51d5b 100644 --- a/nac3artiq/src/codegen.rs +++ b/nac3artiq/src/codegen.rs @@ -287,7 +287,7 @@ fn rpc_codegen_callback_fn<'ctx, 'a>( args: Vec<(Option, ValueEnum<'ctx>)>, generator: &mut dyn CodeGenerator, ) -> Result>, String> { - let ptr_type = ctx.ctx.i8_type().ptr_type(inkwell::AddressSpace::Generic); + let ptr_type = ctx.ctx.i8_type().ptr_type(inkwell::AddressSpace::default()); let size_type = generator.get_size_type(ctx.ctx); let int8 = ctx.ctx.i8_type(); let int32 = ctx.ctx.i32_type(); @@ -405,8 +405,8 @@ fn rpc_codegen_callback_fn<'ctx, 'a>( ctx.ctx.void_type().fn_type( &[ int32.into(), - tag_ptr_type.ptr_type(AddressSpace::Generic).into(), - ptr_type.ptr_type(AddressSpace::Generic).into(), + tag_ptr_type.ptr_type(AddressSpace::default()).into(), + ptr_type.ptr_type(AddressSpace::default()).into(), ], false, ), diff --git a/nac3artiq/src/symbol_resolver.rs b/nac3artiq/src/symbol_resolver.rs index c1716935..ce5071a0 100644 --- a/nac3artiq/src/symbol_resolver.rs +++ b/nac3artiq/src/symbol_resolver.rs @@ -832,12 +832,12 @@ impl InnerResolver { let size_t = generator.get_size_type(ctx.ctx); let arr_ty = ctx .ctx - .struct_type(&[ty.ptr_type(AddressSpace::Generic).into(), size_t.into()], false); + .struct_type(&[ty.ptr_type(AddressSpace::default()).into(), size_t.into()], false); { if self.global_value_ids.read().contains_key(&id) { let global = ctx.module.get_global(&id_str).unwrap_or_else(|| { - ctx.module.add_global(arr_ty, Some(AddressSpace::Generic), &id_str) + ctx.module.add_global(arr_ty, Some(AddressSpace::default()), &id_str) }); return Ok(Some(global.as_pointer_value().into())); } else { @@ -860,7 +860,7 @@ impl InnerResolver { let arr_global = ctx.module.add_global( ty.array_type(len as u32), - Some(AddressSpace::Generic), + Some(AddressSpace::default()), &(id_str.clone() + "_"), ); let arr: BasicValueEnum = if ty.is_int_type() { @@ -885,11 +885,11 @@ impl InnerResolver { arr_global.set_initializer(&arr); let val = arr_ty.const_named_struct(&[ - arr_global.as_pointer_value().const_cast(ty.ptr_type(AddressSpace::Generic)).into(), + arr_global.as_pointer_value().const_cast(ty.ptr_type(AddressSpace::default())).into(), size_t.const_int(len as u64, false).into(), ]); - let global = ctx.module.add_global(arr_ty, Some(AddressSpace::Generic), &id_str); + let global = ctx.module.add_global(arr_ty, Some(AddressSpace::default()), &id_str); global.set_initializer(&val); Ok(Some(global.as_pointer_value().into())) @@ -929,7 +929,7 @@ impl InnerResolver { // for option type, just a null ptr Ok(Some( ctx.get_llvm_type(generator, option_val_ty) - .ptr_type(AddressSpace::Generic) + .ptr_type(AddressSpace::default()) .const_null() .into(), )) @@ -947,14 +947,14 @@ impl InnerResolver { { if self.global_value_ids.read().contains_key(&id) { let global = ctx.module.get_global(&global_str).unwrap_or_else(|| { - ctx.module.add_global(v.get_type(), Some(AddressSpace::Generic), &global_str) + ctx.module.add_global(v.get_type(), Some(AddressSpace::default()), &global_str) }); return Ok(Some(global.as_pointer_value().into())); } else { self.global_value_ids.write().insert(id, obj.into()); } } - let global = ctx.module.add_global(v.get_type(), Some(AddressSpace::Generic), &global_str); + let global = ctx.module.add_global(v.get_type(), Some(AddressSpace::default()), &global_str); global.set_initializer(&v); Ok(Some(global.as_pointer_value().into())) }, @@ -980,7 +980,7 @@ impl InnerResolver { { if self.global_value_ids.read().contains_key(&id) { let global = ctx.module.get_global(&id_str).unwrap_or_else(|| { - ctx.module.add_global(ty, Some(AddressSpace::Generic), &id_str) + ctx.module.add_global(ty, Some(AddressSpace::default()), &id_str) }); return Ok(Some(global.as_pointer_value().into())); } else { @@ -1002,7 +1002,7 @@ impl InnerResolver { if let Some(values) = values { let val = ty.const_named_struct(&values); let global = ctx.module.get_global(&id_str).unwrap_or_else(|| { - ctx.module.add_global(ty, Some(AddressSpace::Generic), &id_str) + ctx.module.add_global(ty, Some(AddressSpace::default()), &id_str) }); global.set_initializer(&val); Ok(Some(global.as_pointer_value().into())) diff --git a/nac3artiq/src/timeline.rs b/nac3artiq/src/timeline.rs index f66fc589..47f95367 100644 --- a/nac3artiq/src/timeline.rs +++ b/nac3artiq/src/timeline.rs @@ -20,7 +20,7 @@ impl TimeFns for NowPinningTimeFns64 { .get_global("now") .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now")); let now_hiptr = - ctx.builder.build_bitcast(now, i32_type.ptr_type(AddressSpace::Generic), "now_hiptr"); + ctx.builder.build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now_hiptr"); if let BasicValueEnum::PointerValue(now_hiptr) = now_hiptr { let now_loptr = unsafe { ctx.builder.build_gep(now_hiptr, &[i32_type.const_int(2, false)], "now_gep") @@ -62,7 +62,7 @@ impl TimeFns for NowPinningTimeFns64 { .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now")); let now_hiptr = ctx.builder.build_bitcast( now, - i32_type.ptr_type(AddressSpace::Generic), + i32_type.ptr_type(AddressSpace::default()), "now_bitcast", ); if let BasicValueEnum::PointerValue(now_hiptr) = now_hiptr { @@ -97,7 +97,7 @@ impl TimeFns for NowPinningTimeFns64 { .get_global("now") .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now")); let now_hiptr = - ctx.builder.build_bitcast(now, i32_type.ptr_type(AddressSpace::Generic), "now_hiptr"); + ctx.builder.build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now_hiptr"); if let BasicValueEnum::PointerValue(now_hiptr) = now_hiptr { let now_loptr = unsafe { ctx.builder.build_gep(now_hiptr, &[i32_type.const_int(2, false)], "now_loptr") @@ -189,7 +189,7 @@ impl TimeFns for NowPinningTimeFns { .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now")); let now_hiptr = ctx.builder.build_bitcast( now, - i32_type.ptr_type(AddressSpace::Generic), + i32_type.ptr_type(AddressSpace::default()), "now_bitcast", ); if let BasicValueEnum::PointerValue(now_hiptr) = now_hiptr { @@ -238,7 +238,7 @@ impl TimeFns for NowPinningTimeFns { let time_lo = ctx.builder.build_int_truncate(time, i32_type, "now_trunc"); let now_hiptr = ctx.builder.build_bitcast( now, - i32_type.ptr_type(AddressSpace::Generic), + i32_type.ptr_type(AddressSpace::default()), "now_bitcast", ); if let BasicValueEnum::PointerValue(now_hiptr) = now_hiptr { diff --git a/nac3core/src/codegen/expr.rs b/nac3core/src/codegen/expr.rs index f2038db7..faff3e47 100644 --- a/nac3core/src/codegen/expr.rs +++ b/nac3core/src/codegen/expr.rs @@ -152,7 +152,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> { _ => unreachable!("must be option type"), }; let actual_ptr_type = - self.get_llvm_type(generator, ty).ptr_type(AddressSpace::Generic); + self.get_llvm_type(generator, ty).ptr_type(AddressSpace::default()); actual_ptr_type.const_null().into() } } @@ -719,12 +719,12 @@ pub fn gen_call<'ctx, 'a, G: CodeGenerator>( args.iter().enumerate().map(|(i, arg)| match ctx.get_llvm_type(generator, arg.ty) { BasicTypeEnum::StructType(ty) if is_extern => { byvals.push((i, ty)); - ty.ptr_type(AddressSpace::Generic).into() + ty.ptr_type(AddressSpace::default()).into() }, x => x }.into()).collect_vec(); if has_sret { - params.insert(0, ret_type.unwrap().ptr_type(AddressSpace::Generic).into()); + params.insert(0, ret_type.unwrap().ptr_type(AddressSpace::default()).into()); } let fun_ty = match ret_type { Some(ret_type) if !has_sret => ret_type.fn_type(¶ms, false), @@ -774,7 +774,7 @@ pub fn allocate_list<'ctx, 'a, G: CodeGenerator>( let size_t = generator.get_size_type(ctx.ctx); let i32_t = ctx.ctx.i32_type(); let arr_ty = - ctx.ctx.struct_type(&[ty.ptr_type(AddressSpace::Generic).into(), size_t.into()], false); + ctx.ctx.struct_type(&[ty.ptr_type(AddressSpace::default()).into(), size_t.into()], false); let zero = ctx.ctx.i32_type().const_zero(); let arr_str_ptr = ctx.builder.build_alloca(arr_ty, "tmparrstr"); unsafe { @@ -1063,7 +1063,7 @@ pub fn gen_expr<'ctx, 'a, G: CodeGenerator>( TypeEnum::TObj { obj_id: opt_id, .. }, ) if *obj_id == *opt_id => ctx .get_llvm_type(generator, *params.iter().next().unwrap().1) - .ptr_type(AddressSpace::Generic) + .ptr_type(AddressSpace::default()) .const_null() .into(), _ => unreachable!("must be option type"), diff --git a/nac3core/src/codegen/irrt/mod.rs b/nac3core/src/codegen/irrt/mod.rs index 95f6e52f..ca2d8364 100644 --- a/nac3core/src/codegen/irrt/mod.rs +++ b/nac3core/src/codegen/irrt/mod.rs @@ -284,7 +284,7 @@ pub fn list_slice_assignment<'ctx, 'a>( src_idx: (IntValue<'ctx>, IntValue<'ctx>, IntValue<'ctx>), ) { let size_ty = generator.get_size_type(ctx.ctx); - let int8_ptr = ctx.ctx.i8_type().ptr_type(AddressSpace::Generic); + let int8_ptr = ctx.ctx.i8_type().ptr_type(AddressSpace::default()); let int32 = ctx.ctx.i32_type(); let (fun_symbol, elem_ptr_type) = ("__nac3_list_slice_assign_var_size", int8_ptr); let slice_assign_fun = { diff --git a/nac3core/src/codegen/mod.rs b/nac3core/src/codegen/mod.rs index a7be388b..c5ba07e8 100644 --- a/nac3core/src/codegen/mod.rs +++ b/nac3core/src/codegen/mod.rs @@ -318,7 +318,7 @@ fn get_llvm_type<'ctx>( primitives, *params.iter().next().unwrap().1, ) - .ptr_type(AddressSpace::Generic) + .ptr_type(AddressSpace::default()) .into(); } _ => unreachable!("must be option type"), @@ -332,12 +332,12 @@ fn get_llvm_type<'ctx>( { let name = unifier.stringify(ty); match module.get_struct_type(&name) { - Some(t) => t.ptr_type(AddressSpace::Generic).into(), + Some(t) => t.ptr_type(AddressSpace::default()).into(), None => { let struct_type = ctx.opaque_struct_type(&name); type_cache.insert( unifier.get_representative(ty), - struct_type.ptr_type(AddressSpace::Generic).into() + struct_type.ptr_type(AddressSpace::default()).into() ); let fields = fields_list .iter() @@ -355,7 +355,7 @@ fn get_llvm_type<'ctx>( }) .collect_vec(); struct_type.set_body(&fields, false); - struct_type.ptr_type(AddressSpace::Generic).into() + struct_type.ptr_type(AddressSpace::default()).into() } } } else { @@ -381,10 +381,10 @@ fn get_llvm_type<'ctx>( ctx, module, generator, unifier, top_level, type_cache, primitives, *ty, ); let fields = [ - element_type.ptr_type(AddressSpace::Generic).into(), + element_type.ptr_type(AddressSpace::default()).into(), generator.get_size_type(ctx).into(), ]; - ctx.struct_type(&fields, false).ptr_type(AddressSpace::Generic).into() + ctx.struct_type(&fields, false).ptr_type(AddressSpace::default()).into() } TVirtual { .. } => unimplemented!(), _ => unreachable!("{}", ty_enum.get_type_name()), @@ -470,7 +470,7 @@ pub fn gen_func_impl<'ctx, G: CodeGenerator, F: FnOnce(&mut G, &mut CodeGenConte None => { let str_type = context.opaque_struct_type("str"); let fields = [ - context.i8_type().ptr_type(AddressSpace::Generic).into(), + context.i8_type().ptr_type(AddressSpace::default()).into(), generator.get_size_type(context).into(), ]; str_type.set_body(&fields, false); @@ -479,11 +479,11 @@ pub fn gen_func_impl<'ctx, G: CodeGenerator, F: FnOnce(&mut G, &mut CodeGenConte Some(t) => t.as_basic_type_enum() } }), - (primitives.range, context.i32_type().array_type(3).ptr_type(AddressSpace::Generic).into()), + (primitives.range, context.i32_type().array_type(3).ptr_type(AddressSpace::default()).into()), (primitives.exception, { let name = "Exception"; match module.get_struct_type(name) { - Some(t) => t.ptr_type(AddressSpace::Generic).as_basic_type_enum(), + Some(t) => t.ptr_type(AddressSpace::default()).as_basic_type_enum(), None => { let exception = context.opaque_struct_type("Exception"); let int32 = context.i32_type().into(); @@ -491,7 +491,7 @@ pub fn gen_func_impl<'ctx, G: CodeGenerator, F: FnOnce(&mut G, &mut CodeGenConte let str_ty = module.get_struct_type("str").unwrap().as_basic_type_enum(); let fields = [int32, str_ty, int32, int32, str_ty, str_ty, int64, int64, int64]; exception.set_body(&fields, false); - exception.ptr_type(AddressSpace::Generic).as_basic_type_enum() + exception.ptr_type(AddressSpace::default()).as_basic_type_enum() } } }) @@ -543,7 +543,7 @@ pub fn gen_func_impl<'ctx, G: CodeGenerator, F: FnOnce(&mut G, &mut CodeGenConte .collect_vec(); if has_sret { - params.insert(0, ret_type.unwrap().ptr_type(AddressSpace::Generic).into()); + params.insert(0, ret_type.unwrap().ptr_type(AddressSpace::default()).into()); } let fn_type = match ret_type { diff --git a/nac3core/src/codegen/stmt.rs b/nac3core/src/codegen/stmt.rs index 59373a7d..c5758cb6 100644 --- a/nac3core/src/codegen/stmt.rs +++ b/nac3core/src/codegen/stmt.rs @@ -639,7 +639,7 @@ pub fn gen_try<'ctx, 'a, G: CodeGenerator>( ctx.module.add_function(personality_symbol, ty, None) }); let exception_type = ctx.get_llvm_type(generator, ctx.primitives.exception); - let ptr_type = ctx.ctx.i8_type().ptr_type(inkwell::AddressSpace::Generic); + let ptr_type = ctx.ctx.i8_type().ptr_type(inkwell::AddressSpace::default()); let current_block = ctx.builder.get_insert_block().unwrap(); let current_fun = current_block.get_parent().unwrap(); let landingpad = ctx.ctx.append_basic_block(current_fun, "try.landingpad"); diff --git a/nix/windows/default.nix b/nix/windows/default.nix index 7a2bcd39..186cedd1 100644 --- a/nix/windows/default.nix +++ b/nix/windows/default.nix @@ -83,7 +83,7 @@ in rec { cargoLock = { lockFile = ../../Cargo.lock; outputHashes = { - "inkwell-0.1.0" = "sha256-Gp2NR5O7ICOsuHrrRH8oTG0sFGwZGNwi/6AH7hkoLB0="; + "inkwell-0.1.0" = "sha256-LYW9/KS+tmFR3aUU30D1wTo3+MedXUuavp9Mbf8NCoY="; }; }; nativeBuildInputs = [ pkgs.wineWowPackages.stable ];