core: WIP - Add tracer runtime

Cargo.lock

@@ -75,33 +75,33 @@ dependencies = [
 
 [[package]]
 name = "ascii-canvas"
-version = "4.0.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef1e3e699d84ab1b0911a1010c5c106aa34ae89aeac103be5ce0c3859db1e891"
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
 dependencies = [
  "term",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "bit-set"
-version = "0.8.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.8.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bitflags"
@@ -109,15 +109,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -126,9 +117,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
 dependencies = [
  "shlex",
 ]
@@ -141,9 +132,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.19"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -151,9 +142,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.19"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
@@ -163,14 +154,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -197,15 +188,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "cpufeatures"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@@ -263,23 +245,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
-name = "crypto-common"
+name = "crunchy"
-version = "0.1.6"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "dirs-next"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "generic-array",
+ "cfg-if",
- "typenum",
+ "dirs-sys-next",
 ]
 
 [[package]]
-name = "digest"
+name = "dirs-sys-next"
-version = "0.10.7"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
- "block-buffer",
+ "libc",
- "crypto-common",
+ "redox_users",
+ "winapi",
 ]
 
 [[package]]
@@ -340,16 +329,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getopts"
 version = "0.2.21"
@@ -385,12 +364,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
-
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -403,15 +376,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -424,12 +388,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -440,9 +404,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "inkwell"
-version = "0.5.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40fb405537710d51f6bdbc8471365ddd4cd6d3a3c3ad6e0c8291691031ba94b2"
+checksum = "b597a7b2cdf279aeef6d7149071e35e4bc87c2cf05a5b7f2d731300bffe587ea"
 dependencies = [
  "either",
  "inkwell_internals",
@@ -454,13 +418,13 @@ dependencies = [
 
 [[package]]
 name = "inkwell_internals"
-version = "0.10.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd28cfd4cfba665d47d31c08a6ba637eed16770abca2eccbbc3ca831fef1e44"
+checksum = "4fa4d8d74483041a882adaa9a29f633253a66dde85055f0495c121620ac484b2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -483,6 +447,15 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.13.0"
@@ -498,45 +471,35 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "keccak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
-dependencies = [
- "cpufeatures",
-]
-
 [[package]]
 name = "lalrpop"
-version = "0.22.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06093b57658c723a21da679530e061a8c25340fa5a6f98e313b542268c7e2a1f"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
 dependencies = [
  "ascii-canvas",
  "bit-set",
  "ena",
- "itertools",
+ "itertools 0.11.0",
  "lalrpop-util",
  "petgraph",
  "pico-args",
  "regex",
  "regex-syntax",
- "sha3",
  "string_cache",
  "term",
+ "tiny-keccak",
  "unicode-xid",
  "walkdir",
 ]
 
 [[package]]
 name = "lalrpop-util"
-version = "0.22.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feee752d43abd0f4807a921958ab4131f692a44d4d599733d4419c5d586176ce"
+checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
  "regex-automata",
- "rustversion",
 ]
 
 [[package]]
@@ -547,9 +510,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libloading"
@@ -561,6 +524,16 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags",
+ "libc",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -621,7 +594,7 @@ dependencies = [
 name = "nac3artiq"
 version = "0.1.0"
 dependencies = [
- "itertools",
+ "itertools 0.13.0",
  "nac3core",
  "nac3ld",
  "parking_lot",
@@ -644,11 +617,11 @@ name = "nac3core"
 version = "0.1.0"
 dependencies = [
  "crossbeam",
- "indexmap 2.6.0",
+ "indexmap 2.5.0",
  "indoc",
  "inkwell",
  "insta",
- "itertools",
+ "itertools 0.13.0",
  "nac3parser",
  "parking_lot",
  "rayon",
@@ -698,12 +671,9 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-dependencies = [
- "portable-atomic",
-]
 
 [[package]]
 name = "parking_lot"
@@ -735,7 +705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.5.0",
 ]
 
 [[package]]
@@ -778,7 +748,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -807,9 +777,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
 
 [[package]]
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
 [[package]]
 name = "ppv-lite86"
@@ -882,7 +852,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -895,7 +865,7 @@ dependencies = [
  "proc-macro2",
  "pyo3-build-config",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -959,18 +929,29 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
-name = "regex"
+name = "redox_users"
-version = "1.11.0"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom",
+ "libredox",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -980,9 +961,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -991,9 +972,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "runkernel"
@@ -1004,9 +985,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
 dependencies = [
  "bitflags",
  "errno",
@@ -1050,22 +1031,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.209"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1092,16 +1073,6 @@ dependencies = [
  "yaml-rust",
 ]
 
-[[package]]
-name = "sha3"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
-dependencies = [
- "digest",
- "keccak",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -1172,7 +1143,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1188,9 +1159,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1205,9 +1176,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -1218,12 +1189,13 @@ dependencies = [
 
 [[package]]
 name = "term"
-version = "1.0.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4175de05129f31b80458c6df371a15e7fc3fd367272e6bf938e5c351c7ea0"
+checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
 dependencies = [
- "home",
+ "dirs-next",
- "windows-sys 0.52.0",
+ "rustversion",
+ "winapi",
 ]
 
 [[package]]
@@ -1241,29 +1213,32 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]
 
 [[package]]
-name = "typenum"
+name = "tiny-keccak"
-version = "1.17.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
 
 [[package]]
 name = "unic-char-property"
@@ -1319,27 +1294,27 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.6"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
 [[package]]
 name = "unicode_names2"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1673eca9782c84de5f81b82e4109dcfb3611c8ba0d52930ec4a9478f547b2dd"
+checksum = "addeebf294df7922a1164f729fb27ebbbcea99cc32b3bf08afab62757f707677"
 dependencies = [
  "phf",
  "unicode_names2_generator",
@@ -1347,9 +1322,9 @@ dependencies = [
 
 [[package]]
 name = "unicode_names2_generator"
-version = "1.3.0"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91e5b84611016120197efd7dc93ef76774f4e084cd73c9fb3ea4a86c570c56e"
+checksum = "f444b8bba042fe3c1251ffaca35c603f2dc2ccc08d595c65a8c4f76f3e8426c0"
 dependencies = [
  "getopts",
  "log",
@@ -1391,6 +1366,22 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
@@ -1400,6 +1391,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -1509,5 +1506,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.79",
+ "syn 2.0.77",
 ]

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727348695,
+        "lastModified": 1725432240,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
         "type": "github"
       },
       "original": {

nac3artiq/Cargo.toml

@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 itertools = "0.13"
 pyo3 = { version = "0.21", features = ["extension-module", "gil-refs"] }
 parking_lot = "0.12"
-tempfile = "3.13"
+tempfile = "3.10"
 nac3core = { path = "../nac3core" }
 nac3ld = { path = "../nac3ld" }
 

nac3artiq/demo/min_artiq.py

@@ -112,15 +112,10 @@ def extern(function):
     register_function(function)
     return function
 
-
+def rpc(function):
-def rpc(arg=None, flags={}):
+    """Decorates a function declaration defined by the core device runtime."""
-    """Decorates a function or method to be executed on the host interpreter."""
+    register_function(function)
-    if arg is None:
+    return function
-        def inner_decorator(function):
-            return rpc(function, flags)
-        return inner_decorator
-    register_function(arg)
-    return arg
 
 def kernel(function_or_method):
     """Decorates a function or method to be executed on the core device."""

nac3artiq/src/codegen.rs

@@ -1,17 +1,3 @@
-use std::{
-    collections::{hash_map::DefaultHasher, HashMap},
-    hash::{Hash, Hasher},
-    iter::once,
-    mem,
-    sync::Arc,
-};
-
-use itertools::Itertools;
-use pyo3::{
-    types::{PyDict, PyList},
-    PyObject, PyResult, Python,
-};
-
 use nac3core::{
     codegen::{
         classes::{
@@ -24,21 +10,38 @@ use nac3core::{
         stmt::{gen_block, gen_for_callback_incrementing, gen_if_callback, gen_with},
         CodeGenContext, CodeGenerator,
     },
-    inkwell::{
-        context::Context,
-        module::Linkage,
-        types::{BasicType, IntType},
-        values::{BasicValueEnum, IntValue, PointerValue, StructValue},
-        AddressSpace, IntPredicate, OptimizationLevel,
-    },
-    nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef},
     symbol_resolver::ValueEnum,
     toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, DefinitionId, GenCall},
     typecheck::typedef::{iter_type_vars, FunSignature, FuncArg, Type, TypeEnum, VarMap},
 };
 
+use nac3core::nac3parser::ast::{Expr, ExprKind, Located, Stmt, StmtKind, StrRef};
+
+use nac3core::inkwell::{
+    context::Context,
+    module::Linkage,
+    types::{BasicType, IntType},
+    values::{BasicValueEnum, PointerValue, StructValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+
+use pyo3::{
+    types::{PyDict, PyList},
+    PyObject, PyResult, Python,
+};
+
 use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
 
+use itertools::Itertools;
+use nac3core::inkwell::values::IntValue;
+use std::{
+    collections::{hash_map::DefaultHasher, HashMap},
+    hash::{Hash, Hasher},
+    iter::once,
+    mem,
+    sync::Arc,
+};
+
 /// The parallelism mode within a block.
 #[derive(Copy, Clone, Eq, PartialEq)]
 enum ParallelMode {
@@ -512,7 +515,7 @@ fn format_rpc_arg<'ctx>(
             ctx.builder.build_store(arg_slot, arg).unwrap();
 
             ctx.builder
-                .build_bit_cast(arg_slot, llvm_pi8, "rpc.arg")
+                .build_bitcast(arg_slot, llvm_pi8, "rpc.arg")
                 .map(BasicValueEnum::into_pointer_value)
                 .unwrap()
         }
@@ -659,7 +662,7 @@ fn format_rpc_ret<'ctx>(
                 .unwrap();
             let buffer = ctx
                 .builder
-                .build_bit_cast(buffer, llvm_pi8, "")
+                .build_bitcast(buffer, llvm_pi8, "")
                 .map(BasicValueEnum::into_pointer_value)
                 .unwrap();
             let buffer = ArraySliceValue::from_ptr_val(buffer, buffer_size, None);
@@ -782,7 +785,7 @@ fn format_rpc_ret<'ctx>(
 
         _ => {
             let slot = ctx.builder.build_alloca(llvm_ret_ty, "rpc.ret.slot").unwrap();
-            let slotgen = ctx.builder.build_bit_cast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
+            let slotgen = ctx.builder.build_bitcast(slot, llvm_pi8, "rpc.ret.ptr").unwrap();
             ctx.builder.build_unconditional_branch(head_bb).unwrap();
             ctx.builder.position_at_end(head_bb);
 
@@ -803,7 +806,7 @@ fn format_rpc_ret<'ctx>(
             let alloc_ptr =
                 ctx.builder.build_array_alloca(llvm_pi8, alloc_size, "rpc.alloc").unwrap();
             let alloc_ptr =
-                ctx.builder.build_bit_cast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
+                ctx.builder.build_bitcast(alloc_ptr, llvm_pi8, "rpc.alloc.ptr").unwrap();
             phi.add_incoming(&[(&alloc_ptr, alloc_bb)]);
             ctx.builder.build_unconditional_branch(head_bb).unwrap();
 
@@ -821,7 +824,6 @@ fn rpc_codegen_callback_fn<'ctx>(
     fun: (&FunSignature, DefinitionId),
     args: Vec<(Option<StrRef>, ValueEnum<'ctx>)>,
     generator: &mut dyn CodeGenerator,
-    is_async: bool,
 ) -> Result<Option<BasicValueEnum<'ctx>>, String> {
     let int8 = ctx.ctx.i8_type();
     let int32 = ctx.ctx.i32_type();
@@ -930,29 +932,6 @@ fn rpc_codegen_callback_fn<'ctx>(
     }
 
     // call
-    if is_async {
-        let rpc_send_async = ctx.module.get_function("rpc_send_async").unwrap_or_else(|| {
-            ctx.module.add_function(
-                "rpc_send_async",
-                ctx.ctx.void_type().fn_type(
-                    &[
-                        int32.into(),
-                        tag_ptr_type.ptr_type(AddressSpace::default()).into(),
-                        ptr_type.ptr_type(AddressSpace::default()).into(),
-                    ],
-                    false,
-                ),
-                None,
-            )
-        });
-        ctx.builder
-            .build_call(
-                rpc_send_async,
-                &[service_id.into(), tag_ptr.into(), args_ptr.into()],
-                "rpc.send",
-            )
-            .unwrap();
-    } else {
     let rpc_send = ctx.module.get_function("rpc_send").unwrap_or_else(|| {
         ctx.module.add_function(
             "rpc_send",
@@ -970,15 +949,10 @@ fn rpc_codegen_callback_fn<'ctx>(
     ctx.builder
         .build_call(rpc_send, &[service_id.into(), tag_ptr.into(), args_ptr.into()], "rpc.send")
         .unwrap();
-    }
 
     // reclaim stack space used by arguments
     call_stackrestore(ctx, stackptr);
 
-    if is_async {
-        // async RPCs do not return any values
-        Ok(None)
-    } else {
     let result = format_rpc_ret(generator, ctx, fun.0.ret);
 
     if !result.is_some_and(|res| res.get_type().is_pointer_type()) {
@@ -988,7 +962,6 @@ fn rpc_codegen_callback_fn<'ctx>(
 
     Ok(result)
 }
-}
 
 pub fn attributes_writeback(
     ctx: &mut CodeGenContext<'_, '_>,
@@ -1082,7 +1055,7 @@ pub fn attributes_writeback(
         let args: Vec<_> =
             values.into_iter().map(|(_, val)| (None, ValueEnum::Dynamic(val))).collect();
         if let Err(e) =
-            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator, false)
+            rpc_codegen_callback_fn(ctx, None, (&fun, PrimDef::Int32.id()), args, generator)
         {
             return Ok(Err(e));
         }
@@ -1092,9 +1065,9 @@ pub fn attributes_writeback(
     Ok(())
 }
 
-pub fn rpc_codegen_callback(is_async: bool) -> Arc<GenCall> {
+pub fn rpc_codegen_callback() -> Arc<GenCall> {
-    Arc::new(GenCall::new(Box::new(move |ctx, obj, fun, args, generator| {
+    Arc::new(GenCall::new(Box::new(|ctx, obj, fun, args, generator| {
-        rpc_codegen_callback_fn(ctx, obj, fun, args, generator, is_async)
+        rpc_codegen_callback_fn(ctx, obj, fun, args, generator)
     })))
 }
 

nac3artiq/src/lib.rs

@@ -16,30 +16,16 @@
     clippy::wildcard_imports
 )]
 
-use std::{
+use std::collections::{HashMap, HashSet};
-    collections::{HashMap, HashSet},
+use std::fs;
-    fs,
+use std::io::Write;
-    io::Write,
+use std::process::Command;
-    process::Command,
+use std::rc::Rc;
-    rc::Rc,
+use std::sync::Arc;
-    sync::Arc,
-};
 
 use itertools::Itertools;
-use parking_lot::{Mutex, RwLock};
+use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
-use pyo3::{
+use nac3core::inkwell::{
-    create_exception, exceptions,
-    prelude::*,
-    types::{PyBytes, PyDict, PySet},
-};
-use tempfile::{self, TempDir};
-
-use nac3core::{
-    codegen::{
-        concrete_type::ConcreteTypeStore, gen_func_impl, irrt::load_irrt, CodeGenLLVMOptions,
-        CodeGenTargetMachineOptions, CodeGenTask, WithCall, WorkerRegistry,
-    },
-    inkwell::{
     context::Context,
     memory_buffer::MemoryBuffer,
     module::{Linkage, Module},
@@ -47,22 +33,32 @@ use nac3core::{
     support::is_multithreaded,
     targets::*,
     OptimizationLevel,
-    },
+};
-    nac3parser::{
+use nac3core::nac3parser::{
-        ast::{Constant, ExprKind, Located, Stmt, StmtKind, StrRef},
+    ast::{ExprKind, Stmt, StmtKind, StrRef},
     parser::parse_program,
-    },
+};
+use nac3core::toplevel::builtins::get_exn_constructor;
+use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
+use pyo3::create_exception;
+use pyo3::prelude::*;
+use pyo3::{exceptions, types::PyBytes, types::PyDict, types::PySet};
+
+use parking_lot::{Mutex, RwLock};
+
+use nac3core::{
+    codegen::irrt::load_irrt,
+    codegen::tracert::TraceRuntimeConfig,
+    codegen::{concrete_type::ConcreteTypeStore, CodeGenTask, WithCall, WorkerRegistry},
     symbol_resolver::SymbolResolver,
     toplevel::{
-        builtins::get_exn_constructor,
         composer::{BuiltinFuncCreator, BuiltinFuncSpec, ComposerConfig, TopLevelComposer},
         DefinitionId, GenCall, TopLevelDef,
     },
-    typecheck::{
+    typecheck::typedef::{FunSignature, FuncArg},
-        type_inferencer::PrimitiveStore,
+    typecheck::{type_inferencer::PrimitiveStore, typedef::Type},
-        typedef::{into_var_map, FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
-    },
 };
+
 use nac3ld::Linker;
 
 use crate::{
@@ -70,13 +66,15 @@ use crate::{
         attributes_writeback, gen_core_log, gen_rtio_log, rpc_codegen_callback, ArtiqCodeGenerator,
     },
     symbol_resolver::{DeferredEvaluationStore, InnerResolver, PythonHelper, Resolver},
-    timeline::TimeFns,
 };
+use tempfile::{self, TempDir};
 
 mod codegen;
 mod symbol_resolver;
 mod timeline;
 
+use timeline::TimeFns;
+
 #[derive(PartialEq, Clone, Copy)]
 enum Isa {
     Host,
@@ -197,8 +195,10 @@ impl Nac3 {
                     body.retain(|stmt| {
                         if let StmtKind::FunctionDef { ref decorator_list, .. } = stmt.node {
                             decorator_list.iter().any(|decorator| {
-                                if let Some(id) = decorator_id_string(decorator) {
+                                if let ExprKind::Name { id, .. } = decorator.node {
-                                    id == "kernel" || id == "portable" || id == "rpc"
+                                    id.to_string() == "kernel"
+                                        || id.to_string() == "portable"
+                                        || id.to_string() == "rpc"
                                 } else {
                                     false
                                 }
@@ -211,8 +211,9 @@ impl Nac3 {
                 }
                 StmtKind::FunctionDef { ref decorator_list, .. } => {
                     decorator_list.iter().any(|decorator| {
-                        if let Some(id) = decorator_id_string(decorator) {
+                        if let ExprKind::Name { id, .. } = decorator.node {
-                            id == "extern" || id == "kernel" || id == "portable" || id == "rpc"
+                            let id = id.to_string();
+                            id == "extern" || id == "portable" || id == "kernel" || id == "rpc"
                         } else {
                             false
                         }
@@ -478,25 +479,9 @@ impl Nac3 {
 
             match &stmt.node {
                 StmtKind::FunctionDef { decorator_list, .. } => {
-                    if decorator_list
+                    if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
-                        .iter()
+                        store_fun.call1(py, (def_id.0.into_py(py), module.getattr(py, name.to_string().as_str()).unwrap())).unwrap();
-                        .any(|decorator| decorator_id_string(decorator) == Some("rpc".to_string()))
+                        rpc_ids.push((None, def_id));
-                    {
-                        store_fun
-                            .call1(
-                                py,
-                                (
-                                    def_id.0.into_py(py),
-                                    module.getattr(py, name.to_string().as_str()).unwrap(),
-                                ),
-                            )
-                            .unwrap();
-                        let is_async = decorator_list.iter().any(|decorator| {
-                            decorator_get_flags(decorator)
-                                .iter()
-                                .any(|constant| *constant == Constant::Str("async".into()))
-                        });
-                        rpc_ids.push((None, def_id, is_async));
                     }
                 }
                 StmtKind::ClassDef { name, body, .. } => {
@@ -504,26 +489,19 @@ impl Nac3 {
                     let class_obj = module.getattr(py, class_name.as_str()).unwrap();
                     for stmt in body {
                         if let StmtKind::FunctionDef { name, decorator_list, .. } = &stmt.node {
-                            if decorator_list.iter().any(|decorator| {
+                            if decorator_list.iter().any(|decorator| matches!(decorator.node, ExprKind::Name { id, .. } if id == "rpc".into())) {
-                                decorator_id_string(decorator) == Some("rpc".to_string())
-                            }) {
-                                let is_async = decorator_list.iter().any(|decorator| {
-                                    decorator_get_flags(decorator)
-                                        .iter()
-                                        .any(|constant| *constant == Constant::Str("async".into()))
-                                });
                                 if name == &"__init__".into() {
                                     return Err(CompileError::new_err(format!(
                                         "compilation failed\n----------\nThe constructor of class {} should not be decorated with rpc decorator (at {})",
                                         class_name, stmt.location
                                     )));
                                 }
-                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id, is_async));
+                                rpc_ids.push((Some((class_obj.clone(), *name)), def_id));
                             }
                         }
                     }
                 }
-                _ => (),
+                _ => ()
             }
 
             let id = *name_to_pyid.get(&name).unwrap();
@@ -619,12 +597,13 @@ impl Nac3 {
         let top_level = Arc::new(composer.make_top_level_context());
 
         {
+            let rpc_codegen = rpc_codegen_callback();
             let defs = top_level.definitions.read();
-            for (class_data, id, is_async) in &rpc_ids {
+            for (class_data, id) in &rpc_ids {
                 let mut def = defs[id.0].write();
                 match &mut *def {
                     TopLevelDef::Function { codegen_callback, .. } => {
-                        *codegen_callback = Some(rpc_codegen_callback(*is_async));
+                        *codegen_callback = Some(rpc_codegen.clone());
                     }
                     TopLevelDef::Class { methods, .. } => {
                         let (class_def, method_name) = class_data.as_ref().unwrap();
@@ -635,7 +614,7 @@ impl Nac3 {
                             if let TopLevelDef::Function { codegen_callback, .. } =
                                 &mut *defs[id.0].write()
                             {
-                                *codegen_callback = Some(rpc_codegen_callback(*is_async));
+                                *codegen_callback = Some(rpc_codegen.clone());
                                 store_fun
                                     .call1(
                                         py,
@@ -650,11 +629,6 @@ impl Nac3 {
                             }
                         }
                     }
-                    TopLevelDef::Variable { .. } => {
-                        return Err(CompileError::new_err(String::from(
-                            "Unsupported @rpc annotation on global variable",
-                        )))
-                    }
                 }
             }
         }
@@ -726,8 +700,13 @@ impl Nac3 {
 
         let membuffer = membuffers.clone();
         py.allow_threads(|| {
-            let (registry, handles) =
+            let (registry, handles) = WorkerRegistry::create_workers(
-                WorkerRegistry::create_workers(threads, top_level.clone(), &self.llvm_options, &f);
+                threads,
+                top_level.clone(),
+                &self.llvm_options,
+                &TraceRuntimeConfig::default(),
+                &f,
+            );
             registry.add_task(task);
             registry.wait_tasks_complete(handles);
 
@@ -871,41 +850,6 @@ impl Nac3 {
     }
 }
 
-/// Retrieves the Name.id from a decorator, supports decorators with arguments.
-fn decorator_id_string(decorator: &Located<ExprKind>) -> Option<String> {
-    if let ExprKind::Name { id, .. } = decorator.node {
-        // Bare decorator
-        return Some(id.to_string());
-    } else if let ExprKind::Call { func, .. } = &decorator.node {
-        // Decorators that are calls (e.g. "@rpc()") have Call for the node,
-        // need to extract the id from within.
-        if let ExprKind::Name { id, .. } = func.node {
-            return Some(id.to_string());
-        }
-    }
-    None
-}
-
-/// Retrieves flags from a decorator, if any.
-fn decorator_get_flags(decorator: &Located<ExprKind>) -> Vec<Constant> {
-    let mut flags = vec![];
-    if let ExprKind::Call { keywords, .. } = &decorator.node {
-        for keyword in keywords {
-            if keyword.node.arg != Some("flags".into()) {
-                continue;
-            }
-            if let ExprKind::Set { elts } = &keyword.node.value.node {
-                for elt in elts {
-                    if let ExprKind::Constant { value, .. } = &elt.node {
-                        flags.push(value.clone());
-                    }
-                }
-            }
-        }
-    }
-    flags
-}
-
 fn link_with_lld(elf_filename: String, obj_filename: String) -> PyResult<()> {
     let linker_args = vec![
         "-shared".to_string(),

nac3artiq/src/symbol_resolver.rs

@@ -1,30 +1,17 @@
-use std::{
+use crate::PrimitivePythonId;
-    collections::{HashMap, HashSet},
-    sync::{
-        atomic::{AtomicBool, Ordering::Relaxed},
-        Arc,
-    },
-};
-
 use itertools::Itertools;
-use parking_lot::RwLock;
+use nac3core::inkwell::{
-use pyo3::{
+    module::Linkage,
-    types::{PyDict, PyTuple},
+    types::{BasicType, BasicTypeEnum},
-    PyAny, PyObject, PyResult, Python,
+    values::BasicValueEnum,
+    AddressSpace,
 };
-
+use nac3core::nac3parser::ast::{self, StrRef};
 use nac3core::{
     codegen::{
         classes::{NDArrayType, ProxyType},
         CodeGenContext, CodeGenerator,
     },
-    inkwell::{
-        module::Linkage,
-        types::{BasicType, BasicTypeEnum},
-        values::BasicValueEnum,
-        AddressSpace,
-    },
-    nac3parser::ast::{self, StrRef},
     symbol_resolver::{StaticValue, SymbolResolver, SymbolValue, ValueEnum},
     toplevel::{
         helper::PrimDef,
@@ -36,8 +23,18 @@ use nac3core::{
         typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
     },
 };
-
+use parking_lot::RwLock;
-use crate::PrimitivePythonId;
+use pyo3::{
+    types::{PyDict, PyTuple},
+    PyAny, PyObject, PyResult, Python,
+};
+use std::{
+    collections::{HashMap, HashSet},
+    sync::{
+        atomic::{AtomicBool, Ordering::Relaxed},
+        Arc,
+    },
+};
 
 pub enum PrimitiveValue {
     I32(i32),
@@ -1470,7 +1467,6 @@ impl SymbolResolver for Resolver {
         &self,
         id: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
-        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         let sym_value = {
             let id_to_val = self.0.id_to_pyval.read();

nac3artiq/src/timeline.rs

@@ -1,11 +1,8 @@
 use itertools::Either;
-
+use nac3core::codegen::CodeGenContext;
-use nac3core::{
+use nac3core::inkwell::{
-    codegen::CodeGenContext,
-    inkwell::{
     values::{BasicValueEnum, CallSiteValue},
     AddressSpace, AtomicOrdering,
-    },
 };
 
 /// Functions for manipulating the timeline.
@@ -34,7 +31,7 @@ impl TimeFns for NowPinningTimeFns64 {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -83,7 +80,7 @@ impl TimeFns for NowPinningTimeFns64 {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -112,7 +109,7 @@ impl TimeFns for NowPinningTimeFns64 {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -210,7 +207,7 @@ impl TimeFns for NowPinningTimeFns {
             .unwrap_or_else(|| ctx.module.add_global(i64_type, None, "now"));
         let now_hiptr = ctx
             .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 
@@ -261,7 +258,7 @@ impl TimeFns for NowPinningTimeFns {
         let time_lo = ctx.builder.build_int_truncate(time, i32_type, "time.lo").unwrap();
         let now_hiptr = ctx
             .builder
-            .build_bit_cast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
+            .build_bitcast(now, i32_type.ptr_type(AddressSpace::default()), "now.hi.addr")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap();
 

nac3core/Cargo.toml

@@ -6,19 +6,20 @@ edition = "2021"
 
 [features]
 no-escape-analysis = []
+tracing = []
 
 [dependencies]
 itertools = "0.13"
 crossbeam = "0.8"
-indexmap = "2.6"
+indexmap = "2.2"
 parking_lot = "0.12"
-rayon = "1.10"
+rayon = "1.8"
 nac3parser = { path = "../nac3parser" }
 strum = "0.26"
 strum_macros = "0.26"
 
 [dependencies.inkwell]
-version = "0.5"
+version = "0.4"
 default-features = false
 features = ["llvm14-0-prefer-dynamic", "target-x86", "target-arm", "target-riscv", "no-libffi-linking"]
 
@@ -28,4 +29,5 @@ indoc = "2.0"
 insta = "=1.11.0"
 
 [build-dependencies]
+itertools = "0.13"
 regex = "1.10"

nac3core/build.rs

@@ -1,3 +1,4 @@
+use std::ffi::OsStr;
 use std::{
     env,
     fs::File,
@@ -6,14 +7,28 @@ use std::{
     process::{Command, Stdio},
 };
 
+use itertools::Itertools;
 use regex::Regex;
 
-fn main() {
+struct IRRTCompilation<'a> {
+    pub file: &'a str,
+    pub gcc_options: Vec<&'a str>,
+    pub cargo_instructions: Vec<&'a str>,
+}
+
+/// Extracts the extension-less filename from a [`Path`].
+fn path_to_extless_filename(path: &Path) -> &str {
+    path.file_name().map(Path::new).and_then(Path::file_stem).and_then(OsStr::to_str).unwrap()
+}
+
+/// Compiles a source C file into LLVM bitcode.
+fn compile_file_to_ir(compile_opts: &IRRTCompilation) {
     let out_dir = env::var("OUT_DIR").unwrap();
-    let out_dir = Path::new(&out_dir);
+    let out_path = Path::new(&out_dir);
     let irrt_dir = Path::new("irrt");
 
-    let irrt_cpp_path = irrt_dir.join("irrt.cpp");
+    let path = Path::new(compile_opts.file);
+    let filename_without_ext = path_to_extless_filename(path);
 
     /*
      * HACK: Sadly, clang doesn't let us emit generic LLVM bitcode.
@@ -35,22 +50,22 @@ fn main() {
         "-",
         "-I",
         irrt_dir.to_str().unwrap(),
-        irrt_cpp_path.to_str().unwrap(),
     ];
 
+    // Apply custom flags from IRRTCompilation
+    flags.extend_from_slice(&compile_opts.gcc_options);
+
     match env::var("PROFILE").as_deref() {
-        Ok("debug") => {
+        Ok("debug") => flags.extend_from_slice(&["-O0", "-DIRRT_DEBUG_ASSERT"]),
-            flags.push("-O0");
+        Ok("release") => flags.push("-O3"),
-            flags.push("-DIRRT_DEBUG_ASSERT");
-        }
-        Ok("release") => {
-            flags.push("-O3");
-        }
         flavor => panic!("Unknown or missing build flavor {flavor:?}"),
     }
 
-    // Tell Cargo to rerun if any file under `irrt_dir` (recursive) changes
+    flags.push(path.to_str().unwrap());
-    println!("cargo:rerun-if-changed={}", irrt_dir.to_str().unwrap());
+
+    // Tell Cargo to rerun if the main IRRT source is changed
+    println!("cargo:rerun-if-changed={}", path.to_str().unwrap());
+    compile_opts.cargo_instructions.iter().for_each(|inst| println!("cargo::{inst}"));
 
     // Compile IRRT and capture the LLVM IR output
     let output = Command::new("clang-irrt")
@@ -62,8 +77,7 @@ fn main() {
         })
         .unwrap();
 
-    // https://github.com/rust-lang/regex/issues/244
+    let output = std::str::from_utf8(&output.stdout).unwrap();
-    let output = std::str::from_utf8(&output.stdout).unwrap().replace("\r\n", "\n");
     let mut filtered_output = String::with_capacity(output.len());
 
     // Filter out irrelevant IR
@@ -77,7 +91,7 @@ fn main() {
         r"(?ms:^define.*?\}$)|(?m:^declare.*?$)|(?m:^%.+?=\s*type\s*\{.+?\}$)|(?m:^@.+?=.+$)",
     )
     .unwrap();
-    for f in regex_filter.captures_iter(&output) {
+    for f in regex_filter.captures_iter(output) {
         assert_eq!(f.len(), 1);
         filtered_output.push_str(&f[0]);
         filtered_output.push('\n');
@@ -91,20 +105,47 @@ fn main() {
     // Doing `DEBUG_DUMP_IRRT=1 cargo build -p nac3core` dumps the LLVM IR generated
     const DEBUG_DUMP_IRRT: &str = "DEBUG_DUMP_IRRT";
     println!("cargo:rerun-if-env-changed={DEBUG_DUMP_IRRT}");
-    if env::var(DEBUG_DUMP_IRRT).is_ok() {
+    if env::var("DEBUG_DUMP_IRRT").is_ok() {
-        let mut file = File::create(out_dir.join("irrt.ll")).unwrap();
+        let mut file = File::create(out_path.join(format!("{filename_without_ext}.ll"))).unwrap();
         file.write_all(output.as_bytes()).unwrap();
 
-        let mut file = File::create(out_dir.join("irrt-filtered.ll")).unwrap();
+        let mut file =
+            File::create(out_path.join(format!("{filename_without_ext}-filtered.ll"))).unwrap();
         file.write_all(filtered_output.as_bytes()).unwrap();
     }
 
     let mut llvm_as = Command::new("llvm-as-irrt")
         .stdin(Stdio::piped())
         .arg("-o")
-        .arg(out_dir.join("irrt.bc"))
+        .arg(out_path.join(format!("{filename_without_ext}.bc")))
         .spawn()
         .unwrap();
     llvm_as.stdin.as_mut().unwrap().write_all(filtered_output.as_bytes()).unwrap();
     assert!(llvm_as.wait().unwrap().success());
 }
+
+fn main() {
+    let irrt_compilations: &[IRRTCompilation] = &[
+        IRRTCompilation {
+            file: "irrt/irrt.cpp",
+            gcc_options: Vec::default(),
+            cargo_instructions: vec!["rerun-if-changed=irrt/irrt"],
+        },
+        IRRTCompilation {
+            file: "irrt/tracert.cpp",
+            gcc_options: Vec::default(),
+            cargo_instructions: Vec::default(),
+        },
+    ];
+
+    assert!(irrt_compilations
+        .iter()
+        .map(|comp| comp.file)
+        .map(Path::new)
+        .map(path_to_extless_filename)
+        .all_unique());
+
+    for path in irrt_compilations {
+        compile_file_to_ir(path)
+    }
+}

nac3core/irrt/tracert.cpp

@@ -0,0 +1,4 @@
+extern "C" {
+// stdio.h
+int printf(const char *format, ...);
+}  // extern "C"

nac3core/src/codegen/builtin_fns.rs

@@ -1,30 +1,21 @@
-use inkwell::{
+use inkwell::types::BasicTypeEnum;
-    types::BasicTypeEnum,
+use inkwell::values::{BasicValue, BasicValueEnum, IntValue, PointerValue};
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
+use inkwell::{FloatPredicate, IntPredicate, OptimizationLevel};
-    FloatPredicate, IntPredicate, OptimizationLevel,
-};
 use itertools::Itertools;
 
-use crate::{
+use crate::codegen::classes::{
-    codegen::{
-        classes::{
     ArrayLikeValue, NDArrayValue, ProxyValue, RangeValue, TypedArrayLikeAccessor,
     UntypedArrayLikeAccessor, UntypedArrayLikeMutator,
-        },
-        expr::destructure_range,
-        extern_fns, irrt,
-        irrt::calculate_len_for_slice_range,
-        llvm_intrinsics,
-        macros::codegen_unreachable,
-        numpy,
-        numpy::ndarray_elementwise_unaryop_impl,
-        stmt::gen_for_callback_incrementing,
-        CodeGenContext, CodeGenerator,
-    },
-    toplevel::helper::PrimDef,
-    toplevel::numpy::unpack_ndarray_var_tys,
-    typecheck::typedef::{Type, TypeEnum},
 };
+use crate::codegen::expr::destructure_range;
+use crate::codegen::irrt::calculate_len_for_slice_range;
+use crate::codegen::macros::codegen_unreachable;
+use crate::codegen::numpy::ndarray_elementwise_unaryop_impl;
+use crate::codegen::stmt::gen_for_callback_incrementing;
+use crate::codegen::{extern_fns, irrt, llvm_intrinsics, numpy, CodeGenContext, CodeGenerator};
+use crate::toplevel::helper::PrimDef;
+use crate::toplevel::numpy::unpack_ndarray_var_tys;
+use crate::typecheck::typedef::{Type, TypeEnum};
 
 /// Shorthand for [`unreachable!()`] when a type of argument is not supported.
 ///

nac3core/src/codegen/classes.rs

@@ -1,16 +1,17 @@
-use inkwell::{
-    context::Context,
-    types::{AnyTypeEnum, ArrayType, BasicType, BasicTypeEnum, IntType, PointerType, StructType},
-    values::{ArrayValue, BasicValue, BasicValueEnum, IntValue, PointerValue, StructValue},
-    AddressSpace, IntPredicate,
-};
-
 use crate::codegen::{
     irrt::{call_ndarray_calc_size, call_ndarray_flatten_index},
     llvm_intrinsics::call_int_umin,
     stmt::gen_for_callback_incrementing,
     CodeGenContext, CodeGenerator,
 };
+use inkwell::context::Context;
+use inkwell::types::{ArrayType, BasicType, StructType};
+use inkwell::values::{ArrayValue, BasicValue, StructValue};
+use inkwell::{
+    types::{AnyTypeEnum, BasicTypeEnum, IntType, PointerType},
+    values::{BasicValueEnum, IntValue, PointerValue},
+    AddressSpace, IntPredicate,
+};
 
 /// A LLVM type that is used to represent a non-primitive type in NAC3.
 pub trait ProxyType<'ctx>: Into<Self::Base> {

nac3core/src/codegen/concrete_type.rs

@@ -1,9 +1,3 @@
-use std::collections::HashMap;
-
-use indexmap::IndexMap;
-
-use nac3parser::ast::StrRef;
-
 use crate::{
     symbol_resolver::SymbolValue,
     toplevel::DefinitionId,
@@ -15,6 +9,10 @@ use crate::{
     },
 };
 
+use indexmap::IndexMap;
+use nac3parser::ast::StrRef;
+use std::collections::HashMap;
+
 pub struct ConcreteTypeStore {
     store: Vec<ConcreteTypeEnum>,
 }

nac3core/src/codegen/expr.rs

@@ -1,23 +1,3 @@
-use std::{
-    cmp::min,
-    collections::HashMap,
-    convert::TryInto,
-    iter::{once, repeat, repeat_with, zip},
-};
-
-use inkwell::{
-    attributes::{Attribute, AttributeLoc},
-    types::{AnyType, BasicType, BasicTypeEnum},
-    values::{BasicValueEnum, CallSiteValue, FunctionValue, IntValue, PointerValue, StructValue},
-    AddressSpace, IntPredicate, OptimizationLevel,
-};
-use itertools::{chain, izip, Either, Itertools};
-
-use nac3parser::ast::{
-    self, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Location, Operator, StrRef,
-    Unaryop,
-};
-
 use crate::{
     codegen::{
         classes::{
@@ -50,6 +30,20 @@ use crate::{
         typedef::{FunSignature, FuncArg, Type, TypeEnum, TypeVarId, Unifier, VarMap},
     },
 };
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    types::{AnyType, BasicType, BasicTypeEnum},
+    values::{BasicValueEnum, CallSiteValue, FunctionValue, IntValue, PointerValue, StructValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+use itertools::{chain, izip, Either, Itertools};
+use nac3parser::ast::{
+    self, Boolop, Cmpop, Comprehension, Constant, Expr, ExprKind, Location, Operator, StrRef,
+    Unaryop,
+};
+use std::cmp::min;
+use std::iter::{repeat, repeat_with};
+use std::{collections::HashMap, convert::TryInto, iter::once, iter::zip};
 
 pub fn get_subst_key(
     unifier: &mut Unifier,
@@ -557,7 +551,7 @@ impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
                             && val_ty.get_element_type().is_struct_type()
                     } =>
                 {
-                    self.builder.build_bit_cast(*val, arg_ty, "call_arg_cast").unwrap()
+                    self.builder.build_bitcast(*val, arg_ty, "call_arg_cast").unwrap()
                 }
                 _ => *val,
             })
@@ -977,7 +971,6 @@ pub fn gen_call<'ctx, G: CodeGenerator>(
             TopLevelDef::Class { .. } => {
                 return Ok(Some(generator.gen_constructor(ctx, fun.0, &def, params)?))
             }
-            TopLevelDef::Variable { .. } => unreachable!(),
         }
     }
     .or_else(|_: String| {
@@ -2886,7 +2879,7 @@ pub fn gen_expr<'ctx, G: CodeGenerator>(
             Some((_, Some(static_value), _)) => ValueEnum::Static(static_value.clone()),
             None => {
                 let resolver = ctx.resolver.clone();
-                resolver.get_symbol_value(*id, ctx, generator).unwrap()
+                resolver.get_symbol_value(*id, ctx).unwrap()
             }
         },
         ExprKind::List { elts, .. } => {

nac3core/src/codegen/extern_fns.rs

@@ -1,8 +1,8 @@
-use inkwell::{
+use inkwell::attributes::{Attribute, AttributeLoc};
-    attributes::{Attribute, AttributeLoc},
+use inkwell::values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue};
-    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+use inkwell::AddressSpace;
-};
+use itertools::{Either, Itertools};
-use itertools::Either;
+use std::iter::once;
 
 use crate::codegen::CodeGenContext;
 
@@ -191,3 +191,49 @@ generate_linalg_extern_fn!(call_np_linalg_det, "np_linalg_det", 2);
 generate_linalg_extern_fn!(call_sp_linalg_lu, "sp_linalg_lu", 3);
 generate_linalg_extern_fn!(call_sp_linalg_schur, "sp_linalg_schur", 3);
 generate_linalg_extern_fn!(call_sp_linalg_hessenberg, "sp_linalg_hessenberg", 3);
+
+/// Invokes the `printf` function.
+pub fn call_printf<'ctx>(
+    ctx: &CodeGenContext<'ctx, '_>,
+    format: &str,
+    args: &[BasicValueEnum<'ctx>],
+) -> IntValue<'ctx> {
+    const FN_NAME: &str = "printf";
+
+    let llvm_i8 = ctx.ctx.i8_type();
+    let llvm_i32 = ctx.ctx.i32_type();
+    let llvm_pi8 = llvm_i8.ptr_type(AddressSpace::default());
+
+    let extern_fn = ctx.module.get_function(FN_NAME).unwrap_or_else(|| {
+        let fn_type = llvm_i32.fn_type(&[llvm_pi8.into()], true);
+        let func = ctx.module.add_function(FN_NAME, fn_type, None);
+        for attr in ["nofree", "nounwind"] {
+            func.add_attribute(
+                AttributeLoc::Function,
+                ctx.ctx.create_enum_attribute(Attribute::get_named_enum_kind_id(attr), 0),
+            );
+        }
+
+        func
+    });
+
+    let pformat = ctx
+        .builder
+        .build_global_string_ptr(&format!("{format}\0"), "")
+        .map(|v| v.as_basic_value_enum())
+        .map(BasicValueEnum::into_pointer_value)
+        .unwrap();
+
+    let fn_args = once(&pformat.as_basic_value_enum())
+        .chain(args)
+        .copied()
+        .map(BasicValueEnum::into)
+        .collect_vec();
+
+    ctx.builder
+        .build_call(extern_fn, fn_args.as_slice(), "")
+        .map(CallSiteValue::try_as_basic_value)
+        .map(|v| v.map_left(BasicValueEnum::into_int_value))
+        .map(Either::unwrap_left)
+        .unwrap()
+}

nac3core/src/codegen/generator.rs

@@ -1,17 +1,15 @@
-use inkwell::{
-    context::Context,
-    types::{BasicTypeEnum, IntType},
-    values::{BasicValueEnum, IntValue, PointerValue},
-};
-
-use nac3parser::ast::{Expr, Stmt, StrRef};
-
 use crate::{
     codegen::{bool_to_i1, bool_to_i8, classes::ArraySliceValue, expr::*, stmt::*, CodeGenContext},
     symbol_resolver::ValueEnum,
     toplevel::{DefinitionId, TopLevelDef},
     typecheck::typedef::{FunSignature, Type},
 };
+use inkwell::{
+    context::Context,
+    types::{BasicTypeEnum, IntType},
+    values::{BasicValueEnum, IntValue, PointerValue},
+};
+use nac3parser::ast::{Expr, Stmt, StrRef};
 
 pub trait CodeGenerator {
     /// Return the module name for the code generator.

nac3core/src/codegen/irrt/mod.rs

@@ -1,15 +1,4 @@
-use inkwell::{
+use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
-    attributes::{Attribute, AttributeLoc},
-    context::Context,
-    memory_buffer::MemoryBuffer,
-    module::Module,
-    types::{BasicTypeEnum, IntType},
-    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
-    AddressSpace, IntPredicate,
-};
-use itertools::Either;
-
-use nac3parser::ast::Expr;
 
 use super::{
     classes::{
@@ -21,7 +10,17 @@ use super::{
     stmt::gen_for_callback_incrementing,
     CodeGenContext, CodeGenerator,
 };
-use crate::{symbol_resolver::SymbolResolver, typecheck::typedef::Type};
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    context::Context,
+    memory_buffer::MemoryBuffer,
+    module::Module,
+    types::{BasicTypeEnum, IntType},
+    values::{BasicValue, BasicValueEnum, CallSiteValue, FloatValue, IntValue},
+    AddressSpace, IntPredicate,
+};
+use itertools::Either;
+use nac3parser::ast::Expr;
 
 #[must_use]
 pub fn load_irrt<'ctx>(ctx: &'ctx Context, symbol_resolver: &dyn SymbolResolver) -> Module<'ctx> {

nac3core/src/codegen/llvm_intrinsics.rs

@@ -1,13 +1,11 @@
-use inkwell::{
-    context::Context,
-    intrinsics::Intrinsic,
-    types::{AnyTypeEnum::IntType, FloatType},
-    values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue},
-    AddressSpace,
-};
-use itertools::Either;
-
 use crate::codegen::CodeGenContext;
+use inkwell::context::Context;
+use inkwell::intrinsics::Intrinsic;
+use inkwell::types::AnyTypeEnum::IntType;
+use inkwell::types::FloatType;
+use inkwell::values::{BasicValueEnum, CallSiteValue, FloatValue, IntValue, PointerValue};
+use inkwell::AddressSpace;
+use itertools::Either;
 
 /// Returns the string representation for the floating-point type `ft` when used in intrinsic
 /// functions.
@@ -185,7 +183,7 @@ pub fn call_memcpy_generic<'ctx>(
         dest
     } else {
         ctx.builder
-            .build_bit_cast(dest, llvm_p0i8, "")
+            .build_bitcast(dest, llvm_p0i8, "")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap()
     };
@@ -193,7 +191,7 @@ pub fn call_memcpy_generic<'ctx>(
         src
     } else {
         ctx.builder
-            .build_bit_cast(src, llvm_p0i8, "")
+            .build_bitcast(src, llvm_p0i8, "")
             .map(BasicValueEnum::into_pointer_value)
             .unwrap()
     };

nac3core/src/codegen/mod.rs

@@ -1,12 +1,13 @@
-use std::{
+use crate::{
-    collections::{HashMap, HashSet},
+    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
-    sync::{
+    codegen::tracert::{TraceRuntimeConfig, TraceRuntimeState},
-        atomic::{AtomicBool, Ordering},
+    symbol_resolver::{StaticValue, SymbolResolver},
-        Arc,
+    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
+    typecheck::{
+        type_inferencer::{CodeLocation, PrimitiveStore},
+        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
     },
-    thread,
 };
-
 use crossbeam::channel::{unbounded, Receiver, Sender};
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -24,19 +25,14 @@ use inkwell::{
     AddressSpace, IntPredicate, OptimizationLevel,
 };
 use itertools::Itertools;
-use parking_lot::{Condvar, Mutex};
-
 use nac3parser::ast::{Location, Stmt, StrRef};
-
+use parking_lot::{Condvar, Mutex};
-use crate::{
+use std::collections::{HashMap, HashSet};
-    codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
+use std::sync::{
-    symbol_resolver::{StaticValue, SymbolResolver},
+    atomic::{AtomicBool, Ordering},
-    toplevel::{helper::PrimDef, numpy::unpack_ndarray_var_tys, TopLevelContext, TopLevelDef},
+    Arc,
-    typecheck::{
-        type_inferencer::{CodeLocation, PrimitiveStore},
-        typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},
-    },
 };
+use std::thread;
 
 pub mod builtin_fns;
 pub mod classes;
@@ -48,6 +44,7 @@ pub mod irrt;
 pub mod llvm_intrinsics;
 pub mod numpy;
 pub mod stmt;
+pub mod tracert;
 
 #[cfg(test)]
 mod test;
@@ -220,6 +217,8 @@ pub struct CodeGenContext<'ctx, 'a> {
     /// See [`need_sret`].
     pub need_sret: bool,
 
+    pub tracert_state: Option<TraceRuntimeState>,
+
     /// The current source location.
     pub current_loc: Location,
 }
@@ -267,6 +266,8 @@ pub struct WorkerRegistry {
 
     /// LLVM-related options for code generation.
     pub llvm_options: CodeGenLLVMOptions,
+
+    tracert_config: TraceRuntimeConfig,
 }
 
 impl WorkerRegistry {
@@ -276,6 +277,7 @@ impl WorkerRegistry {
         generators: Vec<Box<G>>,
         top_level_ctx: Arc<TopLevelContext>,
         llvm_options: &CodeGenLLVMOptions,
+        tracert_config: &TraceRuntimeConfig,
         f: &Arc<WithCall>,
     ) -> (Arc<WorkerRegistry>, Vec<thread::JoinHandle<()>>) {
         let (sender, receiver) = unbounded();
@@ -297,6 +299,7 @@ impl WorkerRegistry {
             wait_condvar,
             top_level_ctx,
             llvm_options: llvm_options.clone(),
+            tracert_config: tracert_config.clone(),
         });
 
         let mut handles = Vec::new();
@@ -853,9 +856,10 @@ pub fn gen_func_impl<
     builder.position_at_end(init_bb);
     let body_bb = context.append_basic_block(fn_val, "body");
 
-    // Store non-vararg argument values into local variables
     let mut var_assignment = HashMap::new();
     let offset = u32::from(has_sret);
+
+    // Store non-vararg argument values into local variables
     for (n, arg) in args.iter().enumerate().filter(|(_, arg)| !arg.is_vararg) {
         let param = fn_val.get_nth_param((n as u32) + offset).unwrap();
         let local_type = get_llvm_type(
@@ -980,6 +984,13 @@ pub fn gen_func_impl<
         unifier,
         static_value_store,
         need_sret: has_sret,
+        tracert_state: if cfg!(feature = "tracing")
+            || registry.tracert_config.enabled_tags.is_empty()
+        {
+            None
+        } else {
+            Some(TraceRuntimeState::create(registry.tracert_config.clone()))
+        },
         current_loc: Location::default(),
         debug_info: (dibuilder, compile_unit, func_scope.as_debug_info_scope()),
     };

nac3core/src/codegen/numpy.rs

@@ -1,11 +1,3 @@
-use inkwell::{
-    types::{AnyTypeEnum, BasicType, BasicTypeEnum, PointerType},
-    values::{BasicValue, BasicValueEnum, IntValue, PointerValue},
-    AddressSpace, IntPredicate, OptimizationLevel,
-};
-
-use nac3parser::ast::{Operator, StrRef};
-
 use crate::{
     codegen::{
         classes::{
@@ -35,6 +27,16 @@ use crate::{
         typedef::{FunSignature, Type, TypeEnum},
     },
 };
+use inkwell::{
+    types::BasicType,
+    values::{BasicValueEnum, IntValue, PointerValue},
+    AddressSpace, IntPredicate, OptimizationLevel,
+};
+use inkwell::{
+    types::{AnyTypeEnum, BasicTypeEnum, PointerType},
+    values::BasicValue,
+};
+use nac3parser::ast::{Operator, StrRef};
 
 /// Creates an uninitialized `NDArray` instance.
 fn create_ndarray_uninitialized<'ctx, G: CodeGenerator + ?Sized>(
@@ -940,7 +942,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                         .build_store(
                             lst,
                             ctx.builder
-                                .build_bit_cast(object.as_base_value(), llvm_plist_i8, "")
+                                .build_bitcast(object.as_base_value(), llvm_plist_i8, "")
                                 .unwrap(),
                         )
                         .unwrap();
@@ -962,7 +964,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                                 .builder
                                 .build_load(lst, "")
                                 .map(BasicValueEnum::into_pointer_value)
-                                .map(|v| ctx.builder.build_bit_cast(v, plist_plist_i8, "").unwrap())
+                                .map(|v| ctx.builder.build_bitcast(v, plist_plist_i8, "").unwrap())
                                 .map(BasicValueEnum::into_pointer_value)
                                 .unwrap();
                             let this_dim = ListValue::from_ptr_val(this_dim, llvm_usize, None);
@@ -981,9 +983,7 @@ fn call_ndarray_array_impl<'ctx, G: CodeGenerator + ?Sized>(
                             ctx.builder
                                 .build_store(
                                     lst,
-                                    ctx.builder
+                                    ctx.builder.build_bitcast(next_dim, llvm_plist_i8, "").unwrap(),
-                                        .build_bit_cast(next_dim, llvm_plist_i8, "")
-                                        .unwrap(),
                                 )
                                 .unwrap();
 

nac3core/src/codegen/stmt.rs

@@ -1,16 +1,3 @@
-use inkwell::{
-    attributes::{Attribute, AttributeLoc},
-    basic_block::BasicBlock,
-    types::{BasicType, BasicTypeEnum},
-    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
-    IntPredicate,
-};
-use itertools::{izip, Itertools};
-
-use nac3parser::ast::{
-    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
-};
-
 use super::{
     classes::{ArrayLikeIndexer, ArraySliceValue, ListValue, RangeValue},
     expr::{destructure_range, gen_binop_expr},
@@ -27,6 +14,17 @@ use crate::{
         typedef::{iter_type_vars, FunSignature, Type, TypeEnum},
     },
 };
+use inkwell::{
+    attributes::{Attribute, AttributeLoc},
+    basic_block::BasicBlock,
+    types::{BasicType, BasicTypeEnum},
+    values::{BasicValue, BasicValueEnum, FunctionValue, IntValue, PointerValue},
+    IntPredicate,
+};
+use itertools::{izip, Itertools};
+use nac3parser::ast::{
+    Constant, ExcepthandlerKind, Expr, ExprKind, Location, Stmt, StmtKind, StrRef,
+};
 
 /// See [`CodeGenerator::gen_var_alloc`].
 pub fn gen_var<'ctx>(
@@ -1828,37 +1826,6 @@ pub fn gen_stmt<G: CodeGenerator>(
                 stmt.location,
             );
         }
-        StmtKind::Global { names, .. } => {
-            let registered_globals = ctx
-                .top_level
-                .definitions
-                .read()
-                .iter()
-                .filter_map(|def| {
-                    if let TopLevelDef::Variable { simple_name, ty, .. } = &*def.read() {
-                        Some((*simple_name, *ty))
-                    } else {
-                        None
-                    }
-                })
-                .collect_vec();
-
-            for id in names {
-                let Some((_, ty)) = registered_globals.iter().find(|(name, _)| name == id) else {
-                    return Err(format!("{id} is not a global at {}", stmt.location));
-                };
-
-                let resolver = ctx.resolver.clone();
-                let ptr = resolver
-                    .get_symbol_value(*id, ctx, generator)
-                    .map(|val| val.to_basic_value_enum(ctx, generator, *ty))
-                    .transpose()?
-                    .map(BasicValueEnum::into_pointer_value)
-                    .unwrap();
-
-                ctx.var_assignment.insert(*id, (ptr, None, 0));
-            }
-        }
         _ => unimplemented!(),
     };
     Ok(())

nac3core/src/codegen/test.rs

@@ -1,24 +1,8 @@
-use std::{
-    collections::{HashMap, HashSet},
-    sync::Arc,
-};
-
-use indexmap::IndexMap;
-use indoc::indoc;
-use inkwell::{
-    targets::{InitializationConfig, Target},
-    OptimizationLevel,
-};
-use nac3parser::{
-    ast::{fold::Fold, FileName, StrRef},
-    parser::parse_program,
-};
-use parking_lot::RwLock;
-
 use crate::{
     codegen::{
         classes::{ListType, NDArrayType, ProxyType, RangeType},
         concrete_type::ConcreteTypeStore,
+        tracert::TraceRuntimeConfig,
         CodeGenContext, CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask,
         CodeGenerator, DefaultCodeGenerator, WithCall, WorkerRegistry,
     },
@@ -28,10 +12,24 @@ use crate::{
         DefinitionId, FunInstance, TopLevelContext, TopLevelDef,
     },
     typecheck::{
-        type_inferencer::{FunctionData, IdentifierInfo, Inferencer, PrimitiveStore},
+        type_inferencer::{FunctionData, Inferencer, PrimitiveStore},
         typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
     },
 };
+use indexmap::IndexMap;
+use indoc::indoc;
+use inkwell::{
+    targets::{InitializationConfig, Target},
+    OptimizationLevel,
+};
+use nac3parser::ast::FileName;
+use nac3parser::{
+    ast::{fold::Fold, StrRef},
+    parser::parse_program,
+};
+use parking_lot::RwLock;
+use std::collections::{HashMap, HashSet};
+use std::sync::Arc;
 
 struct Resolver {
     id_to_type: HashMap<StrRef, Type>,
@@ -67,7 +65,6 @@ impl SymbolResolver for Resolver {
         &self,
         _: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
-        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         unimplemented!()
     }
@@ -142,8 +139,7 @@ fn test_primitives() {
     };
     let mut virtual_checks = Vec::new();
     let mut calls = HashMap::new();
-    let mut identifiers: HashMap<_, _> =
+    let mut identifiers: HashSet<_> = ["a".into(), "b".into()].into();
-        ["a".into(), "b".into()].map(|id| (id, IdentifierInfo::default())).into();
     let mut inferencer = Inferencer {
         top_level: &top_level,
         function_data: &mut function_data,
@@ -245,7 +241,13 @@ fn test_primitives() {
         opt_level: OptimizationLevel::Default,
         target: CodeGenTargetMachineOptions::from_host_triple(),
     };
-    let (registry, handles) = WorkerRegistry::create_workers(threads, top_level, &llvm_options, &f);
+    let (registry, handles) = WorkerRegistry::create_workers(
+        threads,
+        top_level,
+        &llvm_options,
+        &TraceRuntimeConfig::default(),
+        &f,
+    );
     registry.add_task(task);
     registry.wait_tasks_complete(handles);
 }
@@ -322,8 +324,7 @@ fn test_simple_call() {
     };
     let mut virtual_checks = Vec::new();
     let mut calls = HashMap::new();
-    let mut identifiers: HashMap<_, _> =
+    let mut identifiers: HashSet<_> = ["a".into(), "foo".into()].into();
-        ["a".into(), "foo".into()].map(|id| (id, IdentifierInfo::default())).into();
     let mut inferencer = Inferencer {
         top_level: &top_level,
         function_data: &mut function_data,
@@ -438,7 +439,13 @@ fn test_simple_call() {
         opt_level: OptimizationLevel::Default,
         target: CodeGenTargetMachineOptions::from_host_triple(),
     };
-    let (registry, handles) = WorkerRegistry::create_workers(threads, top_level, &llvm_options, &f);
+    let (registry, handles) = WorkerRegistry::create_workers(
+        threads,
+        top_level,
+        &llvm_options,
+        &TraceRuntimeConfig::default(),
+        &f,
+    );
     registry.add_task(task);
     registry.wait_tasks_complete(handles);
 }

nac3core/src/codegen/tracert/mod.rs

@@ -0,0 +1,110 @@
+use std::panic::Location;
+
+use inkwell::context::Context;
+use inkwell::memory_buffer::MemoryBuffer;
+use inkwell::module::Module;
+use inkwell::values::BasicValueEnum;
+use inkwell::AtomicOrdering;
+
+use crate::codegen::{extern_fns, CodeGenContext};
+
+#[derive(Clone, Default, Eq, PartialEq)]
+pub struct TraceRuntimeConfig {
+    pub enabled_tags: Vec<String>,
+}
+
+#[derive(Eq, Clone, PartialEq)]
+pub struct TraceRuntimeState {
+    config: TraceRuntimeConfig,
+    indent: usize,
+}
+
+impl TraceRuntimeState {
+    #[must_use]
+    pub fn create(config: TraceRuntimeConfig) -> TraceRuntimeState {
+        TraceRuntimeState { config, indent: 0 }
+    }
+}
+
+#[must_use]
+pub fn load_tracert<'ctx>(ctx: &'ctx Context, config: &TraceRuntimeConfig) -> Option<Module<'ctx>> {
+    if cfg!(feature = "tracing") && !config.enabled_tags.is_empty() {
+        let bitcode_buf = MemoryBuffer::create_from_memory_range(
+            include_bytes!(concat!(env!("OUT_DIR"), "/tracert.bc")),
+            "tracert_bitcode_buffer",
+        );
+        let module = Module::parse_bitcode_from_buffer(&bitcode_buf, ctx).unwrap();
+
+        return Some(module);
+    }
+
+    None
+}
+
+// TODO: Might need to redesign how trace logging should be done
+
+pub fn trace_log<'ctx>(
+    ctx: &mut CodeGenContext<'ctx, '_>,
+    tag: &'static str,
+    format: &'static str,
+    args: &[BasicValueEnum<'ctx>],
+) {
+    if ctx.tracert_state.is_none() {
+        return;
+    }
+
+    // TODO: Add indentation
+    let str = format!("[TRACING] {tag} - {format}\n\0");
+    extern_fns::call_printf(ctx, &str, args);
+}
+
+#[track_caller]
+pub fn trace_log_with_location<'ctx>(
+    ctx: &CodeGenContext<'ctx, '_>,
+    tag: &'static str,
+    format: &str,
+    args: &[BasicValueEnum<'ctx>],
+) {
+    if ctx.tracert_state.is_none() {
+        return;
+    }
+
+    // TODO: Add indentation
+    let caller_loc = Location::caller();
+    let str = format!(
+        "[TRACING] {}:{}:{}: {tag} - {format}\n\0",
+        caller_loc.file(),
+        caller_loc.line(),
+        caller_loc.column()
+    );
+    extern_fns::call_printf(ctx, &str, args);
+}
+
+pub fn trace_push_level(ctx: &mut CodeGenContext<'_, '_>) {
+    let Some(tracert_state) = &mut ctx.tracert_state else {
+        return;
+    };
+
+    debug_assert!(tracert_state.indent < usize::MAX);
+    if tracert_state.indent < usize::MAX {
+        tracert_state.indent = tracert_state.indent.saturating_add(1);
+    }
+}
+
+pub fn trace_pop_level(ctx: &mut CodeGenContext<'_, '_>) {
+    let Some(tracert_state) = &mut ctx.tracert_state else {
+        return;
+    };
+
+    debug_assert!(tracert_state.indent > 0);
+    if tracert_state.indent > 0 {
+        tracert_state.indent = tracert_state.indent.saturating_sub(1);
+    }
+}
+
+#[inline]
+pub fn mfence(ctx: &mut CodeGenContext<'_, '_>) {
+    if ctx.tracert_state.is_some() {
+        ctx.builder.build_fence(AtomicOrdering::SequentiallyConsistent, 0, "").unwrap();
+    }
+}

nac3core/src/symbol_resolver.rs

@@ -1,15 +1,7 @@
-use std::{
+use std::fmt::Debug;
-    collections::{HashMap, HashSet},
+use std::rc::Rc;
-    fmt::{Debug, Display},
+use std::sync::Arc;
-    rc::Rc,
+use std::{collections::HashMap, collections::HashSet, fmt::Display};
-    sync::Arc,
-};
-
-use inkwell::values::{BasicValueEnum, FloatValue, IntValue, PointerValue, StructValue};
-use itertools::{chain, izip, Itertools};
-use parking_lot::RwLock;
-
-use nac3parser::ast::{Constant, Expr, Location, StrRef};
 
 use crate::{
     codegen::{CodeGenContext, CodeGenerator},
@@ -19,6 +11,10 @@ use crate::{
         typedef::{Type, TypeEnum, Unifier, VarMap},
     },
 };
+use inkwell::values::{BasicValueEnum, FloatValue, IntValue, PointerValue, StructValue};
+use itertools::{chain, izip, Itertools};
+use nac3parser::ast::{Constant, Expr, Location, StrRef};
+use parking_lot::RwLock;
 
 #[derive(Clone, PartialEq, Debug)]
 pub enum SymbolValue {
@@ -369,7 +365,6 @@ pub trait SymbolResolver {
         &self,
         str: StrRef,
         ctx: &mut CodeGenContext<'ctx, '_>,
-        generator: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>>;
 
     fn get_default_param_value(&self, expr: &Expr) -> Option<SymbolValue>;

nac3core/src/toplevel/builtins.rs

@@ -1,5 +1,6 @@
 use std::iter::once;
 
+use helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDefDetails};
 use indexmap::IndexMap;
 use inkwell::{
     attributes::{Attribute, AttributeLoc},
@@ -10,10 +11,6 @@ use inkwell::{
 use itertools::Either;
 use strum::IntoEnumIterator;
 
-use super::{
-    helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDefDetails},
-    *,
-};
 use crate::{
     codegen::{
         builtin_fns,
@@ -26,6 +23,8 @@ use crate::{
     typecheck::typedef::{into_var_map, iter_type_vars, TypeVar, VarMap},
 };
 
+use super::*;
+
 type BuiltinInfo = Vec<(Arc<RwLock<TopLevelDef>>, Option<Stmt>)>;
 
 pub fn get_exn_constructor(

nac3core/src/toplevel/composer.rs

@@ -1,17 +1,17 @@
+use nac3parser::ast::fold::Fold;
 use std::rc::Rc;
 
-use nac3parser::ast::{fold::Fold, ExprKind};
-
-use super::*;
 use crate::{
     codegen::{expr::get_subst_key, stmt::exn_constructor},
     symbol_resolver::SymbolValue,
     typecheck::{
-        type_inferencer::{FunctionData, IdentifierInfo, Inferencer},
+        type_inferencer::{FunctionData, Inferencer},
         typedef::{TypeVar, VarMap},
     },
 };
 
+use super::*;
+
 pub struct ComposerConfig {
     pub kernel_ann: Option<&'static str>,
     pub kernel_invariant_ann: &'static str,
@@ -101,8 +101,7 @@ impl TopLevelComposer {
             .iter()
             .map(|def_ast| match *def_ast.0.read() {
                 TopLevelDef::Class { name, .. } => name.to_string(),
-                TopLevelDef::Function { simple_name, .. }
+                TopLevelDef::Function { simple_name, .. } => simple_name.to_string(),
-                | TopLevelDef::Variable { simple_name, .. } => simple_name.to_string(),
             })
             .collect_vec();
 
@@ -382,58 +381,8 @@ impl TopLevelComposer {
                 ))
             }
 
-            ast::StmtKind::AnnAssign { target, annotation, .. } => {
-                let ExprKind::Name { id: name, .. } = target.node else {
-                    return Err(format!(
-                        "global variable declaration must be an identifier (at {})",
-                        ast.location
-                    ));
-                };
-
-                if self.keyword_list.contains(&name) {
-                    return Err(format!(
-                        "cannot use keyword `{}` as a class name (at {})",
-                        name,
-                        ast.location
-                    ));
-                }
-
-                let global_var_name = if mod_path.is_empty() {
-                    name.to_string()
-                } else {
-                    format!("{mod_path}.{name}")
-                };
-                if !defined_names.insert(global_var_name.clone()) {
-                    return Err(format!(
-                        "global variable `{}` defined twice (at {})",
-                        global_var_name,
-                        ast.location
-                    ));
-                }
-
-                let ty_to_be_unified = self.unifier.get_dummy_var().ty;
-                self.definition_ast_list.push((
-                    RwLock::new(Self::make_top_level_variable_def(
-                        global_var_name,
-                        name,
-                        // dummy here, unify with correct type later,
-                        ty_to_be_unified,
-                        *(annotation.clone()),
-                        resolver,
-                        Some(ast.location),
-                    )).into(),
-                    None,
-                ));
-
-                Ok((
-                    name,
-                    DefinitionId(self.definition_ast_list.len() - 1),
-                    Some(ty_to_be_unified),
-                ))
-            }
-
             _ => Err(format!(
-                "registrations of constructs other than top level classes/functions/variables are not supported (at {})",
+                "registrations of constructs other than top level classes/functions are not supported (at {})",
                 ast.location
             )),
         }
@@ -447,7 +396,6 @@ impl TopLevelComposer {
         if inference {
             self.analyze_function_instance()?;
         }
-        self.analyze_top_level_variables()?;
         Ok(())
     }
 
@@ -552,7 +500,6 @@ impl TopLevelComposer {
             }
             Ok(())
         };
-
         let mut errors = HashSet::new();
         for (class_def, class_ast) in def_list.iter().skip(self.builtin_num) {
             if class_ast.is_none() {
@@ -906,6 +853,7 @@ impl TopLevelComposer {
         let unifier = self.unifier.borrow_mut();
         let primitives_store = &self.primitives_ty;
 
+        let mut errors = HashSet::new();
         let mut analyze = |function_def: &Arc<RwLock<TopLevelDef>>, function_ast: &Option<Stmt>| {
             let mut function_def = function_def.write();
             let function_def = &mut *function_def;
@@ -1180,8 +1128,6 @@ impl TopLevelComposer {
             })?;
             Ok(())
         };
-
-        let mut errors = HashSet::new();
         for (function_def, function_ast) in def_list.iter().skip(self.builtin_num) {
             if function_ast.is_none() {
                 continue;
@@ -1756,6 +1702,7 @@ impl TopLevelComposer {
             }
         }
 
+        let mut errors = HashSet::new();
         let mut analyze = |i, def: &Arc<RwLock<TopLevelDef>>, ast: &Option<Stmt>| {
             let class_def = def.read();
             if let TopLevelDef::Class {
@@ -1898,8 +1845,6 @@ impl TopLevelComposer {
             }
             Ok(())
         };
-
-        let mut errors = HashSet::new();
         for (i, (def, ast)) in definition_ast_list.iter().enumerate().skip(self.builtin_num) {
             if ast.is_none() {
                 continue;
@@ -1949,8 +1894,7 @@ impl TopLevelComposer {
             } = &mut *function_def
             {
                 let signature_ty_enum = unifier.get_ty(*signature);
-                let TypeEnum::TFunc(FunSignature { args, ret, vars, .. }) =
+                let TypeEnum::TFunc(FunSignature { args, ret, vars }) = signature_ty_enum.as_ref()
-                    signature_ty_enum.as_ref()
                 else {
                     unreachable!("must be typeenum::tfunc")
                 };
@@ -2058,12 +2002,11 @@ impl TopLevelComposer {
                         })
                     };
                     let mut identifiers = {
-                        let mut result = HashMap::new();
+                        let mut result: HashSet<_> = HashSet::new();
                         if self_type.is_some() {
-                            result.insert("self".into(), IdentifierInfo::default());
+                            result.insert("self".into());
                         }
-                        result
+                        result.extend(inst_args.iter().map(|x| x.name));
-                            .extend(inst_args.iter().map(|x| (x.name, IdentifierInfo::default())));
                         result
                     };
                     let mut calls: HashMap<CodeLocation, CallId> = HashMap::new();
@@ -2114,16 +2057,6 @@ impl TopLevelComposer {
                         instance_to_symbol.insert(String::new(), simple_name.to_string());
                         continue;
                     }
-                    if !decorator_list.is_empty() {
-                        if let ast::ExprKind::Call { func, .. } = &decorator_list[0].node {
-                            if matches!(&func.node,
-                                ast::ExprKind::Name{ id, .. } if id == &"rpc".into())
-                            {
-                                instance_to_symbol.insert(String::new(), simple_name.to_string());
-                                continue;
-                            }
-                        }
-                    }
 
                     let fun_body = body
                         .into_iter()
@@ -2228,57 +2161,4 @@ impl TopLevelComposer {
         }
         Ok(())
     }
-
-    /// Step 6. Analyze and populate the types of global variables.
-    fn analyze_top_level_variables(&mut self) -> Result<(), HashSet<String>> {
-        let def_list = &self.definition_ast_list;
-        let temp_def_list = self.extract_def_list();
-        let unifier = &mut self.unifier;
-        let primitives_store = &self.primitives_ty;
-
-        let mut analyze = |variable_def: &Arc<RwLock<TopLevelDef>>| -> Result<_, HashSet<String>> {
-            let variable_def = &mut *variable_def.write();
-
-            let TopLevelDef::Variable { ty: dummy_ty, ty_decl, resolver, loc, .. } = variable_def
-            else {
-                // not top level variable def, skip
-                return Ok(());
-            };
-
-            let resolver = &**resolver.as_ref().unwrap();
-
-            let ty_annotation = parse_ast_to_type_annotation_kinds(
-                resolver,
-                &temp_def_list,
-                unifier,
-                primitives_store,
-                ty_decl,
-                HashMap::new(),
-            )?;
-            let ty_from_ty_annotation = get_type_from_type_annotation_kinds(
-                &temp_def_list,
-                unifier,
-                primitives_store,
-                &ty_annotation,
-                &mut None,
-            )?;
-
-            unifier.unify(*dummy_ty, ty_from_ty_annotation).map_err(|e| {
-                HashSet::from([e.at(Some(loc.unwrap())).to_display(unifier).to_string()])
-            })?;
-            Ok(())
-        };
-
-        let mut errors = HashSet::new();
-        for (variable_def, _) in def_list.iter().skip(self.builtin_num) {
-            if let Err(e) = analyze(variable_def) {
-                errors.extend(e);
-            }
-        }
-        if !errors.is_empty() {
-            return Err(errors);
-        }
-
-        Ok(())
-    }
 }

nac3core/src/toplevel/helper.rs

@@ -1,17 +1,14 @@
 use std::convert::TryInto;
 
+use crate::symbol_resolver::SymbolValue;
+use crate::toplevel::numpy::unpack_ndarray_var_tys;
+use crate::typecheck::typedef::{into_var_map, iter_type_vars, Mapping, TypeVarId, VarMap};
+use ast::ExprKind;
+use nac3parser::ast::{Constant, Location};
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
-use ast::ExprKind;
-use nac3parser::ast::{Constant, Location};
-
 use super::*;
-use crate::{
-    symbol_resolver::SymbolValue,
-    toplevel::numpy::unpack_ndarray_var_tys,
-    typecheck::typedef::{into_var_map, iter_type_vars, Mapping, TypeVarId, VarMap},
-};
 
 /// All primitive types and functions in nac3core.
 #[derive(Clone, Copy, Debug, EnumIter, PartialEq, Eq)]
@@ -391,9 +388,6 @@ impl TopLevelDef {
                     r
                 }
             ),
-            TopLevelDef::Variable { name, ty, .. } => {
-                format!("Variable {{ name: {name:?}, ty: {:?} }}", unifier.stringify(*ty),)
-            }
         }
     }
 }
@@ -595,18 +589,6 @@ impl TopLevelComposer {
         }
     }
 
-    #[must_use]
-    pub fn make_top_level_variable_def(
-        name: String,
-        simple_name: StrRef,
-        ty: Type,
-        ty_decl: Expr,
-        resolver: Option<Arc<dyn SymbolResolver + Send + Sync>>,
-        loc: Option<Location>,
-    ) -> TopLevelDef {
-        TopLevelDef::Variable { name, simple_name, ty, ty_decl, resolver, loc }
-    }
-
     #[must_use]
     pub fn make_class_method_name(mut class_name: String, method_name: &str) -> String {
         class_name.push('.');

nac3core/src/toplevel/mod.rs

@@ -6,23 +6,23 @@ use std::{
     sync::Arc,
 };
 
-use inkwell::values::BasicValueEnum;
+use super::codegen::CodeGenContext;
-use itertools::Itertools;
+use super::typecheck::type_inferencer::PrimitiveStore;
-use parking_lot::RwLock;
+use super::typecheck::typedef::{
-
+    FunSignature, FuncArg, SharedUnifier, Type, TypeEnum, Unifier, VarMap,
-use nac3parser::ast::{self, Expr, Location, Stmt, StrRef};
+};
-
 use crate::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenerator,
     symbol_resolver::{SymbolResolver, ValueEnum},
     typecheck::{
-        type_inferencer::{CodeLocation, PrimitiveStore},
+        type_inferencer::CodeLocation,
-        typedef::{
+        typedef::{CallId, TypeVarId},
-            CallId, FunSignature, FuncArg, SharedUnifier, Type, TypeEnum, TypeVarId, Unifier,
-            VarMap,
-        },
     },
 };
+use inkwell::values::BasicValueEnum;
+use itertools::Itertools;
+use nac3parser::ast::{self, Location, Stmt, StrRef};
+use parking_lot::RwLock;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, Debug)]
 pub struct DefinitionId(pub usize);
@@ -148,25 +148,6 @@ pub enum TopLevelDef {
         /// Definition location.
         loc: Option<Location>,
     },
-    Variable {
-        /// Qualified name of the global variable, should be unique globally.
-        name: String,
-
-        /// Simple name, the same as in method/function definition.
-        simple_name: StrRef,
-
-        /// Type of the global variable.
-        ty: Type,
-
-        /// The declared type of the global variable.
-        ty_decl: Expr,
-
-        /// Symbol resolver of the module defined the class.
-        resolver: Option<Arc<dyn SymbolResolver + Send + Sync>>,
-
-        /// Definition location.
-        loc: Option<Location>,
-    },
 }
 
 pub struct TopLevelContext {

nac3core/src/toplevel/numpy.rs

@@ -1,5 +1,3 @@
-use itertools::Itertools;
-
 use crate::{
     toplevel::helper::PrimDef,
     typecheck::{
@@ -7,6 +5,7 @@ use crate::{
         typedef::{Type, TypeEnum, TypeVarId, Unifier, VarMap},
     },
 };
+use itertools::Itertools;
 
 /// Creates a `ndarray` [`Type`] with the given type arguments.
 ///

nac3core/src/toplevel/test.rs

@@ -1,24 +1,21 @@
-use std::{collections::HashMap, sync::Arc};
-
-use indoc::indoc;
-use parking_lot::Mutex;
-use test_case::test_case;
-
-use nac3parser::{
-    ast::{fold::Fold, FileName},
-    parser::parse_program,
-};
-
 use super::*;
+use crate::toplevel::helper::PrimDef;
+use crate::typecheck::typedef::into_var_map;
 use crate::{
     codegen::CodeGenContext,
     symbol_resolver::{SymbolResolver, ValueEnum},
-    toplevel::{helper::PrimDef, DefinitionId},
+    toplevel::DefinitionId,
     typecheck::{
         type_inferencer::PrimitiveStore,
-        typedef::{into_var_map, Type, Unifier},
+        typedef::{Type, Unifier},
     },
 };
+use indoc::indoc;
+use nac3parser::ast::FileName;
+use nac3parser::{ast::fold::Fold, parser::parse_program};
+use parking_lot::Mutex;
+use std::{collections::HashMap, sync::Arc};
+use test_case::test_case;
 
 struct ResolverInternal {
     id_to_type: Mutex<HashMap<StrRef, Type>>,
@@ -65,7 +62,6 @@ impl SymbolResolver for Resolver {
         &self,
         _: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
-        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         unimplemented!()
     }

nac3core/src/toplevel/type_annotation.rs

@@ -1,13 +1,9 @@
-use strum::IntoEnumIterator;
-
-use nac3parser::ast::Constant;
-
 use super::*;
-use crate::{
+use crate::symbol_resolver::SymbolValue;
-    symbol_resolver::SymbolValue,
+use crate::toplevel::helper::{PrimDef, PrimDefDetails};
-    toplevel::helper::{PrimDef, PrimDefDetails},
+use crate::typecheck::typedef::VarMap;
-    typecheck::typedef::VarMap,
+use nac3parser::ast::Constant;
-};
+use strum::IntoEnumIterator;
 
 #[derive(Clone, Debug)]
 pub enum TypeAnnotation {

nac3core/src/typecheck/function_check.rs

@@ -1,19 +1,13 @@
-use std::{
+use crate::toplevel::helper::PrimDef;
-    collections::{HashMap, HashSet},
-    iter::once,
-};
 
+use super::type_inferencer::Inferencer;
+use super::typedef::{Type, TypeEnum};
 use nac3parser::ast::{
     self, Constant, Expr, ExprKind,
     Operator::{LShift, RShift},
     Stmt, StmtKind, StrRef,
 };
-
+use std::{collections::HashSet, iter::once};
-use super::{
-    type_inferencer::{IdentifierInfo, Inferencer},
-    typedef::{Type, TypeEnum},
-};
-use crate::toplevel::helper::PrimDef;
 
 impl<'a> Inferencer<'a> {
     fn should_have_value(&mut self, expr: &Expr<Option<Type>>) -> Result<(), HashSet<String>> {
@@ -27,15 +21,15 @@ impl<'a> Inferencer<'a> {
     fn check_pattern(
         &mut self,
         pattern: &Expr<Option<Type>>,
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
     ) -> Result<(), HashSet<String>> {
         match &pattern.node {
             ExprKind::Name { id, .. } if id == &"none".into() => {
                 Err(HashSet::from([format!("cannot assign to a `none` (at {})", pattern.location)]))
             }
             ExprKind::Name { id, .. } => {
-                if !defined_identifiers.contains_key(id) {
+                if !defined_identifiers.contains(id) {
-                    defined_identifiers.insert(*id, IdentifierInfo::default());
+                    defined_identifiers.insert(*id);
                 }
                 self.should_have_value(pattern)?;
                 Ok(())
@@ -75,7 +69,7 @@ impl<'a> Inferencer<'a> {
     fn check_expr(
         &mut self,
         expr: &Expr<Option<Type>>,
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
     ) -> Result<(), HashSet<String>> {
         // there are some cases where the custom field is None
         if let Some(ty) = &expr.custom {
@@ -96,7 +90,7 @@ impl<'a> Inferencer<'a> {
                     return Ok(());
                 }
                 self.should_have_value(expr)?;
-                if !defined_identifiers.contains_key(id) {
+                if !defined_identifiers.contains(id) {
                     match self.function_data.resolver.get_symbol_type(
                         self.unifier,
                         &self.top_level.definitions.read(),
@@ -104,7 +98,7 @@ impl<'a> Inferencer<'a> {
                         *id,
                     ) {
                         Ok(_) => {
-                            self.defined_identifiers.insert(*id, IdentifierInfo::default());
+                            self.defined_identifiers.insert(*id);
                         }
                         Err(e) => {
                             return Err(HashSet::from([format!(
@@ -177,7 +171,9 @@ impl<'a> Inferencer<'a> {
                 let mut defined_identifiers = defined_identifiers.clone();
                 for arg in &args.args {
                     // TODO: should we check the types here?
-                    defined_identifiers.entry(arg.node.arg).or_default();
+                    if !defined_identifiers.contains(&arg.node.arg) {
+                        defined_identifiers.insert(arg.node.arg);
+                    }
                 }
                 self.check_expr(body, &mut defined_identifiers)?;
             }
@@ -240,7 +236,7 @@ impl<'a> Inferencer<'a> {
     fn check_stmt(
         &mut self,
         stmt: &Stmt<Option<Type>>,
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
     ) -> Result<bool, HashSet<String>> {
         match &stmt.node {
             StmtKind::For { target, iter, body, orelse, .. } => {
@@ -266,11 +262,9 @@ impl<'a> Inferencer<'a> {
                 let body_returned = self.check_block(body, &mut body_identifiers)?;
                 let orelse_returned = self.check_block(orelse, &mut orelse_identifiers)?;
 
-                for ident in body_identifiers.keys() {
+                for ident in &body_identifiers {
-                    if !defined_identifiers.contains_key(ident)
+                    if !defined_identifiers.contains(ident) && orelse_identifiers.contains(ident) {
-                        && orelse_identifiers.contains_key(ident)
+                        defined_identifiers.insert(*ident);
-                    {
-                        defined_identifiers.insert(*ident, IdentifierInfo::default());
                     }
                 }
                 Ok(body_returned && orelse_returned)
@@ -301,7 +295,7 @@ impl<'a> Inferencer<'a> {
                     let mut defined_identifiers = defined_identifiers.clone();
                     let ast::ExcepthandlerKind::ExceptHandler { name, body, .. } = &handler.node;
                     if let Some(name) = name {
-                        defined_identifiers.insert(*name, IdentifierInfo::default());
+                        defined_identifiers.insert(*name);
                     }
                     self.check_block(body, &mut defined_identifiers)?;
                 }
@@ -365,40 +359,6 @@ impl<'a> Inferencer<'a> {
                 }
                 Ok(true)
             }
-            StmtKind::Global { names, .. } => {
-                for id in names {
-                    if let Some(id_info) = defined_identifiers.get(id) {
-                        if !id_info.is_global {
-                            return Err(HashSet::from([format!(
-                                "name '{id}' is assigned to before global declaration at {}",
-                                stmt.location,
-                            )]));
-                        }
-
-                        continue;
-                    }
-
-                    match self.function_data.resolver.get_symbol_type(
-                        self.unifier,
-                        &self.top_level.definitions.read(),
-                        self.primitives,
-                        *id,
-                    ) {
-                        Ok(_) => {
-                            self.defined_identifiers
-                                .insert(*id, IdentifierInfo { is_global: true });
-                        }
-                        Err(e) => {
-                            return Err(HashSet::from([format!(
-                                "type error at identifier `{}` ({}) at {}",
-                                id, e, stmt.location
-                            )]))
-                        }
-                    }
-                }
-
-                Ok(false)
-            }
             // break, raise, etc.
             _ => Ok(false),
         }
@@ -407,7 +367,7 @@ impl<'a> Inferencer<'a> {
     pub fn check_block(
         &mut self,
         block: &[Stmt<Option<Type>>],
-        defined_identifiers: &mut HashMap<StrRef, IdentifierInfo>,
+        defined_identifiers: &mut HashSet<StrRef>,
     ) -> Result<bool, HashSet<String>> {
         let mut ret = false;
         for stmt in block {

nac3core/src/typecheck/magic_methods.rs

@@ -1,21 +1,17 @@
-use std::{cmp::max, collections::HashMap, rc::Rc};
+use crate::symbol_resolver::SymbolValue;
-
+use crate::toplevel::helper::PrimDef;
-use itertools::{iproduct, Itertools};
+use crate::toplevel::numpy::{make_ndarray_ty, unpack_ndarray_var_tys};
-use strum::IntoEnumIterator;
+use crate::typecheck::{
-
-use nac3parser::ast::{Cmpop, Operator, StrRef, Unaryop};
-
-use crate::{
-    symbol_resolver::SymbolValue,
-    toplevel::{
-        helper::PrimDef,
-        numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
-    },
-    typecheck::{
     type_inferencer::*,
     typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},
-    },
 };
+use itertools::{iproduct, Itertools};
+use nac3parser::ast::StrRef;
+use nac3parser::ast::{Cmpop, Operator, Unaryop};
+use std::cmp::max;
+use std::collections::HashMap;
+use std::rc::Rc;
+use strum::IntoEnumIterator;
 
 /// The variant of a binary operator.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

nac3core/src/typecheck/type_error.rs

@@ -1,14 +1,14 @@
-use std::{collections::HashMap, fmt::Display};
+use std::collections::HashMap;
+use std::fmt::Display;
 
-use itertools::Itertools;
+use crate::typecheck::{magic_methods::HasOpInfo, typedef::TypeEnum};
-
-use nac3parser::ast::{Cmpop, Location, StrRef};
 
 use super::{
     magic_methods::Binop,
     typedef::{RecordKey, Type, Unifier},
 };
-use crate::typecheck::{magic_methods::HasOpInfo, typedef::TypeEnum};
+use itertools::Itertools;
+use nac3parser::ast::{Cmpop, Location, StrRef};
 
 #[derive(Debug, Clone)]
 pub enum TypeErrorKind {

nac3core/src/typecheck/type_inferencer/mod.rs

@@ -1,36 +1,32 @@
-use std::{
+use std::cmp::max;
-    cell::RefCell,
+use std::collections::{HashMap, HashSet};
-    cmp::max,
+use std::convert::{From, TryInto};
-    collections::{HashMap, HashSet},
+use std::iter::once;
-    convert::{From, TryInto},
+use std::{cell::RefCell, sync::Arc};
-    iter::once,
-    sync::Arc,
-};
-
-use itertools::{izip, Itertools};
-
-use nac3parser::ast::{
-    self,
-    fold::{self, Fold},
-    Arguments, Comprehension, ExprContext, ExprKind, Located, Location, StrRef,
-};
 
 use super::{
     magic_methods::*,
     type_error::{TypeError, TypeErrorKind},
     typedef::{
-        into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, Mapping, OperatorInfo,
+        into_var_map, iter_type_vars, Call, CallId, FunSignature, FuncArg, OperatorInfo,
         RecordField, RecordKey, Type, TypeEnum, TypeVar, Unifier, VarMap,
     },
 };
+use crate::toplevel::type_annotation::TypeAnnotation;
 use crate::{
     symbol_resolver::{SymbolResolver, SymbolValue},
     toplevel::{
         helper::{arraylike_flatten_element_type, arraylike_get_ndims, PrimDef},
         numpy::{make_ndarray_ty, unpack_ndarray_var_tys},
-        type_annotation::TypeAnnotation,
         TopLevelContext, TopLevelDef,
     },
+    typecheck::typedef::Mapping,
+};
+use itertools::{izip, Itertools};
+use nac3parser::ast::{
+    self,
+    fold::{self, Fold},
+    Arguments, Comprehension, ExprContext, ExprKind, Located, Location, StrRef,
 };
 
 #[cfg(test)]
@@ -88,20 +84,6 @@ impl PrimitiveStore {
     }
 }
 
-/// Information regarding a defined identifier.
-#[derive(Clone, Copy, Debug, Default)]
-pub struct IdentifierInfo {
-    /// Whether this identifier refers to a global variable.
-    pub is_global: bool,
-}
-
-impl IdentifierInfo {
-    #[must_use]
-    pub fn new() -> IdentifierInfo {
-        IdentifierInfo::default()
-    }
-}
-
 pub struct FunctionData {
     pub resolver: Arc<dyn SymbolResolver + Send + Sync>,
     pub return_type: Option<Type>,
@@ -110,7 +92,7 @@ pub struct FunctionData {
 
 pub struct Inferencer<'a> {
     pub top_level: &'a TopLevelContext,
-    pub defined_identifiers: HashMap<StrRef, IdentifierInfo>,
+    pub defined_identifiers: HashSet<StrRef>,
     pub function_data: &'a mut FunctionData,
     pub unifier: &'a mut Unifier,
     pub primitives: &'a PrimitiveStore,
@@ -242,7 +224,9 @@ impl<'a> Fold<()> for Inferencer<'a> {
                                 handler.location,
                             ));
                             if let Some(name) = name {
-                                self.defined_identifiers.entry(name).or_default();
+                                if !self.defined_identifiers.contains(&name) {
+                                    self.defined_identifiers.insert(name);
+                                }
                                 if let Some(old_typ) = self.variable_mapping.insert(name, typ) {
                                     let loc = handler.location;
                                     self.unifier.unify(old_typ, typ).map_err(|e| {
@@ -394,7 +378,6 @@ impl<'a> Fold<()> for Inferencer<'a> {
             | ast::StmtKind::Continue { .. }
             | ast::StmtKind::Expr { .. }
             | ast::StmtKind::For { .. }
-            | ast::StmtKind::Global { .. }
             | ast::StmtKind::Pass { .. }
             | ast::StmtKind::Try { .. } => {}
             ast::StmtKind::If { test, .. } | ast::StmtKind::While { test, .. } => {
@@ -566,7 +549,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                         unreachable!("must be tobj")
                     }
                 } else {
-                    if !self.defined_identifiers.contains_key(id) {
+                    if !self.defined_identifiers.contains(id) {
                         match self.function_data.resolver.get_symbol_type(
                             self.unifier,
                             &self.top_level.definitions.read(),
@@ -574,7 +557,7 @@ impl<'a> Fold<()> for Inferencer<'a> {
                             *id,
                         ) {
                             Ok(_) => {
-                                self.defined_identifiers.insert(*id, IdentifierInfo::default());
+                                self.defined_identifiers.insert(*id);
                             }
                             Err(e) => {
                                 return report_error(
@@ -639,8 +622,8 @@ impl<'a> Inferencer<'a> {
     fn infer_pattern<T>(&mut self, pattern: &ast::Expr<T>) -> Result<(), InferenceError> {
         match &pattern.node {
             ExprKind::Name { id, .. } => {
-                if !self.defined_identifiers.contains_key(id) {
+                if !self.defined_identifiers.contains(id) {
-                    self.defined_identifiers.insert(*id, IdentifierInfo::default());
+                    self.defined_identifiers.insert(*id);
                 }
                 Ok(())
             }
@@ -749,8 +732,8 @@ impl<'a> Inferencer<'a> {
         let mut defined_identifiers = self.defined_identifiers.clone();
         for arg in &args.args {
             let name = &arg.node.arg;
-            if !defined_identifiers.contains_key(name) {
+            if !defined_identifiers.contains(name) {
-                defined_identifiers.insert(*name, IdentifierInfo::default());
+                defined_identifiers.insert(*name);
             }
         }
         let fn_args: Vec<_> = args
@@ -1567,29 +1550,36 @@ impl<'a> Inferencer<'a> {
         }
         // 2-argument ndarray n-dimensional creation functions
         if id == &"np_full".into() && args.len() == 2 {
-            // Parse arguments
+            let ExprKind::List { elts, .. } = &args[0].node else {
-            let shape_expr = args.remove(0);
+                return report_error(
-            let (ndims, shape) =
+                    format!(
-                self.fold_numpy_function_call_shape_argument(*id, 0, shape_expr)?; // Special handling for `shape`
+                        "Expected List literal for first argument of {id}, got {}",
+                        args[0].node.name()
+                    )
+                    .as_str(),
+                    args[0].location,
+                );
+            };
 
-            let fill_value = self.fold_expr(args.remove(0))?;
+            let ndims = elts.len() as u64;
 
-            // Build the return type
+            let arg0 = self.fold_expr(args.remove(0))?;
-            let dtype = fill_value.custom.unwrap();
+            let arg1 = self.fold_expr(args.remove(0))?;
+
+            let ty = arg1.custom.unwrap();
             let ndims = self.unifier.get_fresh_literal(vec![SymbolValue::U64(ndims)], None);
-            let ret = make_ndarray_ty(self.unifier, self.primitives, Some(dtype), Some(ndims));
+            let ret = make_ndarray_ty(self.unifier, self.primitives, Some(ty), Some(ndims));
-
             let custom = self.unifier.add_ty(TypeEnum::TFunc(FunSignature {
                 args: vec![
                     FuncArg {
                         name: "shape".into(),
-                        ty: shape.custom.unwrap(),
+                        ty: arg0.custom.unwrap(),
                         default_value: None,
                         is_vararg: false,
                     },
                     FuncArg {
                         name: "fill_value".into(),
-                        ty: fill_value.custom.unwrap(),
+                        ty: arg1.custom.unwrap(),
                         default_value: None,
                         is_vararg: false,
                     },
@@ -1607,7 +1597,7 @@ impl<'a> Inferencer<'a> {
                         location: func.location,
                         node: ExprKind::Name { id: *id, ctx: *ctx },
                     }),
-                    args: vec![shape, fill_value],
+                    args: vec![arg0, arg1],
                     keywords: vec![],
                 },
             }));

nac3core/src/typecheck/type_inferencer/test.rs

@@ -1,19 +1,17 @@
-use std::iter::zip;
+use super::super::{magic_methods::with_fields, typedef::*};
-
-use indexmap::IndexMap;
-use indoc::indoc;
-use parking_lot::RwLock;
-use test_case::test_case;
-
-use nac3parser::{ast::FileName, parser::parse_program};
-
 use super::*;
 use crate::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenContext,
     symbol_resolver::ValueEnum,
     toplevel::{helper::PrimDef, DefinitionId, TopLevelDef},
-    typecheck::{magic_methods::with_fields, typedef::*},
 };
+use indexmap::IndexMap;
+use indoc::indoc;
+use nac3parser::ast::FileName;
+use nac3parser::parser::parse_program;
+use parking_lot::RwLock;
+use std::iter::zip;
+use test_case::test_case;
 
 struct Resolver {
     id_to_type: HashMap<StrRef, Type>,
@@ -43,7 +41,6 @@ impl SymbolResolver for Resolver {
         &self,
         _: StrRef,
         _: &mut CodeGenContext<'ctx, '_>,
-        _: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
         unimplemented!()
     }
@@ -520,7 +517,7 @@ impl TestEnvironment {
             primitives: &mut self.primitives,
             virtual_checks: &mut self.virtual_checks,
             calls: &mut self.calls,
-            defined_identifiers: HashMap::default(),
+            defined_identifiers: HashSet::default(),
             in_handler: false,
         }
     }
@@ -596,9 +593,8 @@ fn test_basic(source: &str, mapping: &HashMap<&str, &str>, virtuals: &[(&str, &s
     println!("source:\n{source}");
     let mut env = TestEnvironment::new();
     let id_to_name = std::mem::take(&mut env.id_to_name);
-    let mut defined_identifiers: HashMap<_, _> =
+    let mut defined_identifiers: HashSet<_> = env.identifier_mapping.keys().copied().collect();
-        env.identifier_mapping.keys().copied().map(|id| (id, IdentifierInfo::default())).collect();
+    defined_identifiers.insert("virtual".into());
-    defined_identifiers.insert("virtual".into(), IdentifierInfo::default());
     let mut inferencer = env.get_inferencer();
     inferencer.defined_identifiers.clone_from(&defined_identifiers);
     let statements = parse_program(source, FileName::default()).unwrap();
@@ -743,9 +739,8 @@ fn test_primitive_magic_methods(source: &str, mapping: &HashMap<&str, &str>) {
     println!("source:\n{source}");
     let mut env = TestEnvironment::basic_test_env();
     let id_to_name = std::mem::take(&mut env.id_to_name);
-    let mut defined_identifiers: HashMap<_, _> =
+    let mut defined_identifiers: HashSet<_> = env.identifier_mapping.keys().copied().collect();
-        env.identifier_mapping.keys().copied().map(|id| (id, IdentifierInfo::default())).collect();
+    defined_identifiers.insert("virtual".into());
-    defined_identifiers.insert("virtual".into(), IdentifierInfo::default());
     let mut inferencer = env.get_inferencer();
     inferencer.defined_identifiers.clone_from(&defined_identifiers);
     let statements = parse_program(source, FileName::default()).unwrap();

nac3core/src/typecheck/typedef/mod.rs

@@ -1,28 +1,21 @@
-use std::{
+use super::magic_methods::{Binop, HasOpInfo};
-    borrow::Cow,
+use super::type_error::{TypeError, TypeErrorKind};
-    cell::RefCell,
+use super::unification_table::{UnificationKey, UnificationTable};
-    collections::{HashMap, HashSet},
+use crate::symbol_resolver::SymbolValue;
-    fmt::{self, Display},
+use crate::toplevel::helper::PrimDef;
-    iter::{repeat, zip},
+use crate::toplevel::{DefinitionId, TopLevelContext, TopLevelDef};
-    rc::Rc,
+use crate::typecheck::magic_methods::OpInfo;
-    sync::{Arc, Mutex},
+use crate::typecheck::type_inferencer::PrimitiveStore;
-};
-
 use indexmap::IndexMap;
 use itertools::{repeat_n, Itertools};
-
 use nac3parser::ast::{Cmpop, Location, StrRef, Unaryop};
-
+use std::cell::RefCell;
-use super::{
+use std::collections::HashMap;
-    magic_methods::{Binop, HasOpInfo},
+use std::fmt::{self, Display};
-    type_error::{TypeError, TypeErrorKind},
+use std::iter::{repeat, zip};
-    unification_table::{UnificationKey, UnificationTable},
+use std::rc::Rc;
-};
+use std::sync::{Arc, Mutex};
-use crate::{
+use std::{borrow::Cow, collections::HashSet};
-    symbol_resolver::SymbolValue,
-    toplevel::{helper::PrimDef, DefinitionId, TopLevelContext, TopLevelDef},
-    typecheck::{magic_methods::OpInfo, type_inferencer::PrimitiveStore},
-};
 
 #[cfg(test)]
 mod test;
@@ -677,8 +670,8 @@ impl Unifier {
         let num_args = posargs.len() + kwargs.len();
 
         // Now we check the arguments against the parameters,
-        // and depending on what `call_info` is, we might change how `unify_call()` behaves
+        // and depending on what `call_info` is, we might change how the behavior `unify_call()`
-        // to improve user error messages when type checking fails.
+        // in hopes to improve user error messages when type checking fails.
         match operator_info {
             Some(OperatorInfo::IsBinaryOp { self_type, operator }) => {
                 // The call is written in the form of (say) `a + b`.

nac3core/src/typecheck/typedef/test.rs

@@ -1,12 +1,10 @@
-use std::collections::HashMap;
+use super::super::magic_methods::with_fields;
-
+use super::*;
 use indoc::indoc;
 use itertools::Itertools;
+use std::collections::HashMap;
 use test_case::test_case;
 
-use super::*;
-use crate::typecheck::magic_methods::with_fields;
-
 impl Unifier {
     /// Check whether two types are equal.
     fn eq(&mut self, a: Type, b: Type) -> bool {

nac3ld/src/lib.rs

@@ -21,12 +21,13 @@
     clippy::wildcard_imports
 )]
 
-use std::{collections::HashMap, mem, ptr, slice, str};
-
-use byteorder::{ByteOrder, LittleEndian};
-
 use dwarf::*;
 use elf::*;
+use std::collections::HashMap;
+use std::{mem, ptr, slice, str};
+
+extern crate byteorder;
+use byteorder::{ByteOrder, LittleEndian};
 
 mod dwarf;
 mod elf;

nac3parser/Cargo.toml

@@ -8,15 +8,15 @@ license = "MIT"
 edition = "2021"
 
 [build-dependencies]
-lalrpop = "0.22"
+lalrpop = "0.20"
 
 [dependencies]
 nac3ast = { path = "../nac3ast" }
-lalrpop-util = "0.22"
+lalrpop-util = "0.20"
 log = "0.4"
 unic-emoji-char = "0.9"
 unic-ucd-ident  = "0.9"
-unicode_names2 = "1.3"
+unicode_names2 = "1.2"
 phf = { version = "0.11", features = ["macros"] }
 ahash = "0.8"
 

nac3parser/src/config_comment_helper.rs

@@ -1,10 +1,8 @@
-use crate::{
+use crate::ast::Ident;
-    ast::{Ident, Location},
+use crate::ast::Location;
-    error::*,
+use crate::error::*;
-    token::Tok,
+use crate::token::Tok;
-};
 use lalrpop_util::ParseError;
-
 use nac3ast::*;
 
 pub fn make_config_comment(

nac3parser/src/error.rs

@@ -1,11 +1,12 @@
 //! Define internal parse error types
 //! The goal is to provide a matching and a safe error API, maksing errors from LALR
-use std::error::Error;
-use std::fmt;
-
 use lalrpop_util::ParseError as LalrpopError;
 
-use crate::{ast::Location, token::Tok};
+use crate::ast::Location;
+use crate::token::Tok;
+
+use std::error::Error;
+use std::fmt;
 
 /// Represents an error during lexical scanning.
 #[derive(Debug, PartialEq)]

nac3parser/src/fstring.rs

@@ -1,11 +1,12 @@
-use std::{iter, mem, str};
+use std::iter;
+use std::mem;
+use std::str;
+
+use crate::ast::{Constant, ConversionFlag, Expr, ExprKind, Location};
+use crate::error::{FStringError, FStringErrorType, ParseError};
+use crate::parser::parse_expression;
 
 use self::FStringErrorType::*;
-use crate::{
-    ast::{Constant, ConversionFlag, Expr, ExprKind, Location},
-    error::{FStringError, FStringErrorType, ParseError},
-    parser::parse_expression,
-};
 
 struct FStringParser<'a> {
     chars: iter::Peekable<str::Chars<'a>>,

nac3parser/src/function.rs

@@ -1,11 +1,8 @@
+use ahash::RandomState;
 use std::collections::HashSet;
 
-use ahash::RandomState;
+use crate::ast;
-
+use crate::error::{LexicalError, LexicalErrorType};
-use crate::{
-    ast,
-    error::{LexicalError, LexicalErrorType},
-};
 
 pub struct ArgumentList {
     pub args: Vec<ast::Expr>,

nac3parser/src/lexer.rs

@@ -1,16 +1,16 @@
 //! This module takes care of lexing python source text.
 //!
 //! This means source code is translated into separate tokens.
-use std::{char, cmp::Ordering, num::IntErrorKind, str::FromStr};
-
-use unic_emoji_char::is_emoji_presentation;
-use unic_ucd_ident::{is_xid_continue, is_xid_start};
 
 pub use super::token::Tok;
-use crate::{
+use crate::ast::{FileName, Location};
-    ast::{FileName, Location},
+use crate::error::{LexicalError, LexicalErrorType};
-    error::{LexicalError, LexicalErrorType},
+use std::char;
-};
+use std::cmp::Ordering;
+use std::num::IntErrorKind;
+use std::str::FromStr;
+use unic_emoji_char::is_emoji_presentation;
+use unic_ucd_ident::{is_xid_continue, is_xid_start};
 
 #[derive(Clone, Copy, PartialEq, Debug, Default)]
 struct IndentationLevel {

nac3parser/src/parser.rs

@@ -5,16 +5,14 @@
 //! parse a whole program, a single statement, or a single
 //! expression.
 
+use nac3ast::Location;
 use std::iter;
 
-use nac3ast::Location;
+use crate::ast::{self, FileName};
-
+use crate::error::ParseError;
+use crate::lexer;
 pub use crate::mode::Mode;
-use crate::{
+use crate::python;
-    ast::{self, FileName},
-    error::ParseError,
-    lexer, python,
-};
 
 /*
  * Parse python code.

nac3parser/src/token.rs

@@ -1,8 +1,7 @@
 //! Different token definitions.
 //! Loosely based on token.h from CPython source:
-use std::fmt::{self, Write};
-
 use crate::ast;
+use std::fmt::{self, Write};
 
 /// Python source code can be tokenized in a sequence of these tokens.
 #[derive(Clone, Debug, PartialEq)]

nac3standalone/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 
 [features]
 no-escape-analysis = ["nac3core/no-escape-analysis"]
+tracing = ["nac3core/tracing"]
 
 [dependencies]
 parking_lot = "0.12"

nac3standalone/demo/demo.c

@@ -65,7 +65,7 @@ struct cslice {
     size_t len;
 };
 
-void output_int32_list(struct cslice* slice) {
+void output_int32_list(const struct cslice* slice) {
     const int32_t* data = (int32_t*)slice->data;
 
     putchar('[');
@@ -80,7 +80,7 @@ void output_int32_list(struct cslice* slice) {
     putchar('\n');
 }
 
-void output_str(struct cslice* slice) {
+void output_str(const struct cslice* slice) {
     const char* data = (const char*)slice->data;
 
     for (size_t i = 0; i < slice->len; ++i) {
@@ -88,12 +88,12 @@ void output_str(struct cslice* slice) {
     }
 }
 
-void output_strln(struct cslice* slice) {
+void output_strln(const struct cslice* slice) {
     output_str(slice);
     putchar('\n');
 }
 
-uint64_t dbg_stack_address(__attribute__((unused)) struct cslice* slice) {
+uint64_t dbg_stack_address(__attribute__((unused)) const struct cslice* slice) {
     int i;
     void* ptr = (void*)&i;
     return (uintptr_t)ptr;

nac3standalone/demo/src/globals.py

@@ -1,31 +0,0 @@
-@extern
-def output_int32(x: int32):
-    ...
-
-@extern
-def output_int64(x: int64):
-    ...
-
-X: int32 = 0
-Y: int64 = int64(1)
-
-def f():
-    global X, Y
-    X = 1
-    Y = int64(2)
-
-def run() -> int32:
-    global X, Y
-
-    output_int32(X)
-    output_int64(Y)
-    f()
-    output_int32(X)
-    output_int64(Y)
-
-    X = 0
-    Y = int64(0)
-    output_int32(X)
-    output_int64(Y)
-
-    return 0

nac3standalone/demo/src/ndarray.py

@@ -114,22 +114,12 @@ def test_ndarray_ones():
     n: ndarray[float, 1] = np_ones([1])
     output_ndarray_float_1(n)
 
-    dim = (1,)
-    n_tup: ndarray[float, 1] = np_ones(dim)
-    output_ndarray_float_1(n_tup)
-
 def test_ndarray_full():
     n_float: ndarray[float, 1] = np_full([1], 2.0)
     output_ndarray_float_1(n_float)
     n_i32: ndarray[int32, 1] = np_full([1], 2)
     output_ndarray_int32_1(n_i32)
 
-    dim = (1,)
-    n_float_tup: ndarray[float, 1] = np_full(dim, 2.0)
-    output_ndarray_float_1(n_float_tup)
-    n_i32_tup: ndarray[int32, 1] = np_full(dim, 2)
-    output_ndarray_int32_1(n_i32_tup)
-
 def test_ndarray_eye():
     n: ndarray[float, 2] = np_eye(2)
     output_ndarray_float_2(n)

nac3standalone/src/basic_symbol_resolver.rs

@@ -1,14 +1,6 @@
-use std::{
+use nac3core::nac3parser::ast::{self, StrRef};
-    collections::{HashMap, HashSet},
-    sync::Arc,
-};
-
-use parking_lot::{Mutex, RwLock};
-
 use nac3core::{
-    codegen::{CodeGenContext, CodeGenerator},
+    codegen::CodeGenContext,
-    inkwell::{module::Linkage, values::BasicValue},
-    nac3parser::ast::{self, StrRef},
     symbol_resolver::{SymbolResolver, SymbolValue, ValueEnum},
     toplevel::{DefinitionId, TopLevelDef},
     typecheck::{
@@ -16,6 +8,9 @@ use nac3core::{
         typedef::{Type, Unifier},
     },
 };
+use parking_lot::{Mutex, RwLock};
+use std::collections::HashSet;
+use std::{collections::HashMap, sync::Arc};
 
 pub struct ResolverInternal {
     pub id_to_type: Mutex<HashMap<StrRef, Type>>,
@@ -50,51 +45,20 @@ impl SymbolResolver for Resolver {
 
     fn get_symbol_type(
         &self,
-        unifier: &mut Unifier,
+        _: &mut Unifier,
         _: &[Arc<RwLock<TopLevelDef>>],
-        primitives: &PrimitiveStore,
+        _: &PrimitiveStore,
         str: StrRef,
     ) -> Result<Type, String> {
-        self.0
+        self.0.id_to_type.lock().get(&str).copied().ok_or(format!("cannot get type of {str}"))
-            .id_to_type
-            .lock()
-            .get(&str)
-            .copied()
-            .or_else(|| {
-                self.0
-                    .module_globals
-                    .lock()
-                    .get(&str)
-                    .cloned()
-                    .map(|v| v.get_type(primitives, unifier))
-            })
-            .ok_or(format!("cannot get type of {str}"))
     }
 
     fn get_symbol_value<'ctx>(
         &self,
-        str: StrRef,
+        _: StrRef,
-        ctx: &mut CodeGenContext<'ctx, '_>,
+        _: &mut CodeGenContext<'ctx, '_>,
-        generator: &mut dyn CodeGenerator,
     ) -> Option<ValueEnum<'ctx>> {
-        self.0.module_globals.lock().get(&str).cloned().map(|v| {
+        unimplemented!()
-            ctx.module
-                .get_global(&str.to_string())
-                .unwrap_or_else(|| {
-                    let ty = v.get_type(&ctx.primitives, &mut ctx.unifier);
-
-                    let init_val = ctx.gen_symbol_val(generator, &v, ty);
-                    let llvm_ty = init_val.get_type();
-
-                    let global = ctx.module.add_global(llvm_ty, None, &str.to_string());
-                    global.set_linkage(Linkage::LinkOnceAny);
-                    global.set_initializer(&init_val);
-
-                    global
-                })
-                .as_basic_value_enum()
-                .into()
-        })
     }
 
     fn get_identifier_def(&self, id: StrRef) -> Result<DefinitionId, HashSet<String>> {

nac3standalone/src/main.rs

@@ -8,29 +8,22 @@
 #![warn(clippy::pedantic)]
 #![allow(clippy::too_many_lines, clippy::wildcard_imports)]
 
-use std::{
-    collections::{HashMap, HashSet},
-    fs,
-    num::NonZeroUsize,
-    path::Path,
-    sync::Arc,
-};
-
 use clap::Parser;
-use parking_lot::{Mutex, RwLock};
+use nac3core::inkwell::{
-
-use nac3core::{
-    codegen::{
-        concrete_type::ConcreteTypeStore, irrt::load_irrt, CodeGenLLVMOptions,
-        CodeGenTargetMachineOptions, CodeGenTask, DefaultCodeGenerator, WithCall, WorkerRegistry,
-    },
-    inkwell::{
     memory_buffer::MemoryBuffer, module::Linkage, passes::PassBuilderOptions,
     support::is_multithreaded, targets::*, OptimizationLevel,
-    },
+};
-    nac3parser::{
+use nac3core::nac3parser::{
     ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
     parser,
+};
+use nac3core::{
+    codegen::{
+        concrete_type::ConcreteTypeStore,
+        irrt::load_irrt,
+        tracert::{load_tracert, TraceRuntimeConfig},
+        CodeGenLLVMOptions, CodeGenTargetMachineOptions, CodeGenTask, DefaultCodeGenerator,
+        WithCall, WorkerRegistry,
     },
     symbol_resolver::SymbolResolver,
     toplevel::{
@@ -44,6 +37,10 @@ use nac3core::{
         typedef::{FunSignature, Type, Unifier, VarMap},
     },
 };
+use parking_lot::{Mutex, RwLock};
+use std::collections::HashSet;
+use std::num::NonZeroUsize;
+use std::{collections::HashMap, fs, path::Path, sync::Arc};
 
 mod basic_symbol_resolver;
 use basic_symbol_resolver::*;
@@ -81,6 +78,9 @@ struct CommandLineArgs {
     /// Additional target features to enable/disable, specified using the `+`/`-` prefixes.
     #[arg(long)]
     target_features: Option<String>,
+
+    #[arg(long)]
+    trace: Vec<String>,
 }
 
 fn handle_typevar_definition(
@@ -245,38 +245,18 @@ fn handle_assignment_pattern(
     }
 }
 
-fn handle_global_var(
-    target: &Expr,
-    value: Option<&Expr>,
-    resolver: &(dyn SymbolResolver + Send + Sync),
-    internal_resolver: &ResolverInternal,
-) -> Result<(), String> {
-    let ExprKind::Name { id, .. } = target.node else {
-        return Err(format!(
-            "global variable declaration must be an identifier (at {})",
-            target.location,
-        ));
-    };
-
-    let Some(value) = value else {
-        return Err(format!("global variable `{id}` must be initialized in its definition"));
-    };
-
-    if let Ok(val) = parse_parameter_default_value(value, resolver) {
-        internal_resolver.add_module_global(id, val);
-        Ok(())
-    } else {
-        Err(format!(
-            "failed to evaluate this expression `{:?}` as a constant at {}",
-            target.node, target.location,
-        ))
-    }
-}
-
 fn main() {
     let cli = CommandLineArgs::parse();
-    let CommandLineArgs { file_name, threads, opt_level, emit_llvm, triple, mcpu, target_features } =
+    let CommandLineArgs {
-        cli;
+        file_name,
+        threads,
+        opt_level,
+        emit_llvm,
+        triple,
+        mcpu,
+        target_features,
+        trace,
+    } = cli;
 
     Target::initialize_all(&InitializationConfig::default());
 
@@ -305,6 +285,7 @@ fn main() {
         // The default behavior for -O<n> where n>3 defaults to O3 for both Clang and GCC
         _ => OptimizationLevel::Aggressive,
     };
+    let tracert_config = TraceRuntimeConfig { enabled_tags: trace };
 
     let target_machine_options = CodeGenTargetMachineOptions {
         triple,
@@ -325,7 +306,8 @@ fn main() {
     let program = match fs::read_to_string(file_name.clone()) {
         Ok(program) => program,
         Err(err) => {
-            panic!("Cannot open input file: {err}");
+            println!("Cannot open input file: {err}");
+            return;
         }
     };
 
@@ -349,6 +331,14 @@ fn main() {
         irrt.write_bitcode_to_path(Path::new("irrt.bc"));
     }
 
+    // Process tracert
+    let tracert = load_tracert(&context, &tracert_config);
+    if let Some(tracert) = &tracert {
+        if emit_llvm {
+            tracert.write_bitcode_to_path(Path::new("tracert.bc"));
+        }
+    }
+
     // Process the Python script
     let parser_result = parser::parse_program(&program, file_name.into()).unwrap();
 
@@ -367,26 +357,10 @@ fn main() {
                     unifier,
                     primitives,
                 ) {
-                    panic!("{err}");
+                    eprintln!("{err}");
+                    return;
                 }
             }
-
-            StmtKind::AnnAssign { target, value, .. } => {
-                if let Err(err) = handle_global_var(
-                    target,
-                    value.as_ref().map(Box::as_ref),
-                    resolver.as_ref(),
-                    internal_resolver.as_ref(),
-                ) {
-                    panic!("{err}");
-                }
-
-                let (name, def_id, _) = composer
-                    .register_top_level(stmt, Some(resolver.clone()), "__main__", true)
-                    .unwrap();
-                internal_resolver.add_id_def(name, def_id);
-            }
-
             // allow (and ignore) "from __future__ import annotations"
             StmtKind::ImportFrom { module, names, .. }
                 if module == &Some("__future__".into())
@@ -466,7 +440,8 @@ fn main() {
     let threads = (0..threads)
         .map(|i| Box::new(DefaultCodeGenerator::new(format!("module{i}"), size_t)))
         .collect();
-    let (registry, handles) = WorkerRegistry::create_workers(threads, top_level, &llvm_options, &f);
+    let (registry, handles) =
+        WorkerRegistry::create_workers(threads, top_level, &llvm_options, &tracert_config, &f);
     registry.add_task(task);
     registry.wait_tasks_complete(handles);
 
@@ -492,6 +467,9 @@ fn main() {
     }
 
     main.link_in_module(irrt).unwrap();
+    if let Some(tracert) = tracert {
+        main.link_in_module(tracert).unwrap();
+    }
 
     // Private all functions except "run"
     let mut function_iter = main.get_first_function();

nix/windows/make_msys2_packages.sh

@@ -10,7 +10,7 @@ curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240523-1-any.pkg.tar
 curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pacman.conf | sed "s|SigLevel    = Required|SigLevel    = Never|g" | sed "s|/etc/pacman.d|$MSYS2DIR/etc/pacman.d|g" > $MSYS2DIR/etc/pacman.conf
 
 fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
-pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-clang-x86_64-rust mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
+pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-clang-x86_64-rust mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-ninja mingw-w64-clang-x86_64-python3.12 mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt
 
 echo "{ pkgs } : [" > msys2_packages.nix
 while read package; do