feat: enable no_opt_arch flag for mimalloc-safe on linux-aarch64 (#98)

JounQin · web-flow · commit b7f33e6e1453 · 2025-04-24T15:48:15.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benches/resolver.rs b/benches/resolver.rs
@@ -101,7 +101,7 @@ fn create_symlinks() -> io::Result<PathBuf> {
     Ok(temp_path)
 }
 
-fn oxc_resolver() -> unrs_resolver::Resolver {
+fn unrs_resolver() -> unrs_resolver::Resolver {
     use unrs_resolver::{AliasValue, ResolveOptions, Resolver};
     let alias_value = AliasValue::from("./");
     Resolver::new(ResolveOptions {
@@ -148,7 +148,7 @@ fn bench_resolver(c: &mut Criterion) {
 
     // check validity
     for (path, request) in &data {
-        assert!(oxc_resolver().resolve(path, request).is_ok(), "{path:?} {request}");
+        assert!(unrs_resolver().resolve(path, request).is_ok(), "{path:?} {request}");
     }
 
     let symlink_test_dir = create_symlinks().expect("Create symlink fixtures failed");
@@ -157,27 +157,27 @@ fn bench_resolver(c: &mut Criterion) {
 
     for i in symlinks_range.clone() {
         assert!(
-            oxc_resolver().resolve(&symlink_test_dir, &format!("./file{i}")).is_ok(),
+            unrs_resolver().resolve(&symlink_test_dir, &format!("./file{i}")).is_ok(),
             "file{i}.js"
         );
     }
 
     let mut group = c.benchmark_group("resolver");
 
     group.bench_with_input(BenchmarkId::from_parameter("single-thread"), &data, |b, data| {
-        let oxc_resolver = oxc_resolver();
+        let unrs_resolver = unrs_resolver();
         b.iter(|| {
             for (path, request) in data {
-                _ = oxc_resolver.resolve(path, request);
+                _ = unrs_resolver.resolve(path, request);
             }
         });
     });
 
     group.bench_with_input(BenchmarkId::from_parameter("multi-thread"), &data, |b, data| {
-        let oxc_resolver = oxc_resolver();
+        let unrs_resolver = unrs_resolver();
         b.iter(|| {
             data.par_iter().for_each(|(path, request)| {
-                _ = oxc_resolver.resolve(path, request);
+                _ = unrs_resolver.resolve(path, request);
             });
         });
     });
@@ -186,11 +186,11 @@ fn bench_resolver(c: &mut Criterion) {
         BenchmarkId::from_parameter("resolve from symlinks"),
         &symlinks_range,
         |b, data| {
-            let oxc_resolver = oxc_resolver();
+            let unrs_resolver = unrs_resolver();
             b.iter(|| {
                 for i in data.clone() {
                     assert!(
-                        oxc_resolver.resolve(&symlink_test_dir, &format!("./file{i}")).is_ok(),
+                        unrs_resolver.resolve(&symlink_test_dir, &format!("./file{i}")).is_ok(),
                         "file{i}.js"
                     );
                 }
diff --git a/justfile b/justfile
@@ -10,7 +10,7 @@ alias r := ready
 # or install via `cargo install cargo-binstall`
 # Initialize the project by installing all the necessary tools.
 init:
-  cargo binstall watchexec-cli typos-cli dprint -y
+  cargo binstall cargo-shear dprint typos-cli watchexec-cli -y
 
 install:
   pnpm install
@@ -52,6 +52,7 @@ check:
 # Run all the tests
 test:
   cargo test --all-features
+  pnpm test
 
 # Lint the whole project
 lint:
diff --git a/napi/Cargo.toml b/napi/Cargo.toml
@@ -16,11 +16,14 @@ napi-derive = { version = "3.0.0-alpha.29" }
 oxc_resolver = { path = "..", package = "unrs_resolver" }
 tracing-subscriber = { version = "0.3.19", default-features = false, features = ["std", "fmt"] } # Omit the `regex` feature
 
-[target.'cfg(all(not(target_os = "linux"), not(target_os = "freebsd"), not(target_arch = "arm"), not(target_family = "wasm")))'.dependencies]
-mimalloc-safe = { version = "0.1.50", features = ["skip_collect_on_exit"] }
+[target.'cfg(not(any(target_os = "linux", target_os = "freebsd", target_arch = "arm", target_family = "wasm")))'.dependencies]
+mimalloc-safe = { version = "0.1.51", features = ["skip_collect_on_exit"] }
 
-[target.'cfg(all(target_os = "linux", not(target_arch = "arm")))'.dependencies]
-mimalloc-safe = { version = "0.1.50", features = ["skip_collect_on_exit", "local_dynamic_tls"] }
+[target.'cfg(all(target_os = "linux", not(target_arch = "arm"), not(target_arch = "aarch64")))'.dependencies]
+mimalloc-safe = { version = "0.1.51", features = ["skip_collect_on_exit", "local_dynamic_tls"] }
+
+[target.'cfg(all(target_os = "linux", target_arch = "aarch64"))'.dependencies]
+mimalloc-safe = { version = "0.1.51", features = ["skip_collect_on_exit", "local_dynamic_tls", "no_opt_arch"] }
 
 [build-dependencies]
 napi-build = "2.1.6"
diff --git a/napi/src/lib.rs b/napi/src/lib.rs
@@ -1,10 +1,4 @@
-// Disable mimalloc on ARM, FreeBSD, WASM, and Linux/aarch64 due to known allocator issues (see #64).
-#[cfg(not(any(
-    target_arch = "arm",
-    target_os = "freebsd",
-    target_family = "wasm",
-    all(target_os = "linux", target_arch = "aarch64")
-)))]
+#[cfg(not(any(target_arch = "arm", target_os = "freebsd", target_family = "wasm")))]
 #[global_allocator]
 static ALLOC: mimalloc_safe::MiMalloc = mimalloc_safe::MiMalloc;
 
diff --git a/napi/tests/resolver.test.mjs b/napi/tests/resolver.test.mjs
@@ -15,11 +15,12 @@ if (process.env.WASI_TEST) {
 
 const currentDir = join(fileURLToPath(import.meta.url), '..');
 
+const rootDir = join(currentDir, '..', '..');
+
+const fixturesDir = join(rootDir, 'fixtures');
+
 const enhancedResolveRoot = join(
-  currentDir,
-  '..',
-  '..',
-  'fixtures',
+  fixturesDir,
   'enhanced_resolve',
   'test',
   'fixtures',
@@ -232,9 +233,10 @@ for (
   });
 }
 
+const pnpmDir = join(rootDir, 'node_modules', '.pnpm');
+
 test('resolve pnpm package', () => {
-  const rootDir = join(currentDir, '..', '..');
-  const pnpmProjectPath = join(rootDir, 'fixtures', 'pnpm');
+  const pnpmProjectPath = join(fixturesDir, 'pnpm');
   const resolver = new ResolverFactory({
     aliasFields: ['browser'],
   });
@@ -243,23 +245,35 @@ test('resolve pnpm package', () => {
   assert.deepEqual(
     styledComponents.path,
     join(
-      rootDir,
-      'node_modules/.pnpm/styled-components@6.1.17_react-dom@19.1.0_react@19.1.0__react@19.1.0/node_modules/styled-components/dist/styled-components.browser.cjs.js',
+      pnpmDir,
+      'styled-components@6.1.17_react-dom@19.1.0_react@19.1.0__react@19.1.0/node_modules/styled-components/dist/styled-components.browser.cjs.js',
     ),
   );
 
   const react = resolver.sync(
     join(
-      rootDir,
-      'node_modules/.pnpm/styled-components@6.1.17_react-dom@19.1.0_react@19.1.0__react@19.1.0/node_modules/styled-components',
+      pnpmDir,
+      'styled-components@6.1.17_react-dom@19.1.0_react@19.1.0__react@19.1.0/node_modules/styled-components',
     ),
     'react',
   );
   assert.deepEqual(
     react.path,
-    join(
-      rootDir,
-      'node_modules/.pnpm/react@19.1.0/node_modules/react/index.js',
-    ),
+    join(pnpmDir, 'react@19.1.0/node_modules/react/index.js'),
+  );
+});
+
+test('resolve recursive symbol link', () => {
+  const workspaceProjectPath = join(fixturesDir, 'pnpm-workspace');
+  const resolver = new ResolverFactory({});
+
+  const react = resolver.sync(
+    join(workspaceProjectPath, './packages/app'),
+    './node_modules/@monorepo/lib/node_modules/react/package.json',
+  );
+
+  assert.deepEqual(
+    react.path,
+    join(pnpmDir, 'react@19.1.0/node_modules/react/package.json'),
   );
 });
diff --git a/npm/package.json b/npm/package.json
@@ -49,6 +49,6 @@
     "postinstall": "napi-postinstall unrs-resolver check"
   },
   "dependencies": {
-    "napi-postinstall": "^0.1.5"
+    "napi-postinstall": "^0.1.6"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,6 @@`
`49`	`49`	`"postinstall": "napi-postinstall unrs-resolver check"`
`50`	`50`	`},`
`51`	`51`	`"dependencies": {`
`52`		`- "napi-postinstall": "^0.1.5"`
	`52`	`+ "napi-postinstall": "^0.1.6"`
`53`	`53`	`}`
`54`	`54`	`}`