Jemallocator was not being used where it should

boa-dev · Apr 13, 2020 · c016b9d · c016b9d
1 parent 02cfe9e
commit c016b9d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 13 deletions.
diff --git a/boa/benches/exec.rs b/boa/benches/exec.rs
@@ -1,8 +1,11 @@
 use boa::{exec, realm::Realm};
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-#[cfg_attr(target = "x86_64-unknown-linux-gnu", global_allocator)]
-#[cfg(target = "x86_64-unknown-linux-gnu")]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(
+    all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
+    global_allocator
+)]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 static SRC: &str = r#"

diff --git a/boa/benches/fib.rs b/boa/benches/fib.rs
@@ -1,8 +1,11 @@
 use boa::exec;
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-#[cfg_attr(target = "x86_64-unknown-linux-gnu", global_allocator)]
-#[cfg(target = "x86_64-unknown-linux-gnu")]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(
+  all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
+  global_allocator
+)]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 static SRC: &str = r#"
@@ -19,9 +22,9 @@ res;
 "#;
 
 fn fibonacci(c: &mut Criterion) {
-    c.bench_function("fibonacci (Execution)", move |b| {
-        b.iter(|| exec(black_box(SRC)))
-    });
+  c.bench_function("fibonacci (Execution)", move |b| {
+    b.iter(|| exec(black_box(SRC)))
+  });
 }
 
 criterion_group!(benches, fibonacci);

diff --git a/boa/benches/parser.rs b/boa/benches/parser.rs
@@ -1,8 +1,11 @@
 use boa::syntax::{lexer::Lexer, parser::Parser};
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-#[cfg_attr(target = "x86_64-unknown-linux-gnu", global_allocator)]
-#[cfg(target = "x86_64-unknown-linux-gnu")]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(
+    all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
+    global_allocator
+)]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 static EXPRESSION: &str = r#"

diff --git a/boa/benches/string.rs b/boa/benches/string.rs
@@ -4,8 +4,11 @@ use boa::{
 };
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 
-#[cfg_attr(target = "x86_64-unknown-linux-gnu", global_allocator)]
-#[cfg(target = "x86_64-unknown-linux-gnu")]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(
+    all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
+    global_allocator
+)]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 static SRC: &str = "let foo = 'hello world!'; foo;";

diff --git a/boa_cli/src/main.rs b/boa_cli/src/main.rs
@@ -40,8 +40,11 @@ use std::{
 };
 use structopt::{clap::arg_enum, StructOpt};
 
-#[cfg_attr(target = "x86_64-unknown-linux-gnu", global_allocator)]
-#[cfg(target = "x86_64-unknown-linux-gnu")]
+#[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))]
+#[cfg_attr(
+    all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"),
+    global_allocator
+)]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
 /// CLI configuration for Boa.