fix(ci): Revert malloc changes

swc-project · Jun 14, 2022 · 709ad3e · 709ad3e
1 parent d5d918a
commit 709ad3e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/swc_node_base/Cargo.toml b/crates/swc_node_base/Cargo.toml
@@ -14,7 +14,7 @@ bench = false
 [dependencies]
 
 [target.'cfg(not(target_os = "linux"))'.dependencies]
-mimalloc-rust = { version = "0.2" }
+mimalloc-rust = { version = "0.1" }
 
-[target.'cfg(all(target_os = "linux", not(all(target_env = "musl", target_arch = "aarch64"))))'.dependencies]
-mimalloc-rust = { version = "0.2", features = ["local-dynamic-tls"] }
+[target.'cfg(all(target_os = "linux", target_env = "gnu", any(target_arch = "x86_64", target_arch = "aarch64")))'.dependencies]
+tikv-jemallocator = { version = "0.4", features = ["disable_initial_exec_tls"] }
diff --git a/crates/swc_node_base/src/lib.rs b/crates/swc_node_base/src/lib.rs
@@ -2,9 +2,14 @@
 //!
 //! The swc crates related to the  node binding should depend on this crate.
 
+#[cfg(not(target_os = "linux"))]
+#[global_allocator]
+static GLOBAL: mimalloc_rust::GlobalMiMalloc = mimalloc_rust::GlobalMiMalloc;
+
 #[cfg(all(
-    not(all(target_os = "linux", target_env = "musl", target_arch = "aarch64")),
-    not(debug_assertions)
+    target_os = "linux",
+    target_env = "gnu",
+    any(target_arch = "x86_64", target_arch = "aarch64")
 ))]
 #[global_allocator]
-static ALLOC: mimalloc_rust::GlobalMiMalloc = mimalloc_rust::GlobalMiMalloc;
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;