Remove direct conversion from &str to JsValue/PropertyKey. (#3319)

* Remove direct conversion from `&str` to `JsValue`/`PropertyKey`. * Allow unused static strings * Introduce DHAT to benchmark data usage * Create new release profile * Fix docs
boa-dev · Sep 29, 2023 · b80409d · b80409d
1 parent 008b0e5
commit b80409d
Show file tree

Hide file tree

Showing 136 changed files with 2,347 additions and 1,621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,7 @@ chrome_profiler.json
 # e2e test
 playwright-report
 test-results
+
+# dhat
+dhat-*.json
+perf.data*
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -101,6 +101,10 @@ lto = "fat"
 # Makes sure that all code is compiled together, for LTO
 codegen-units = 1
 
+[profile.release-dbg]
+inherits = "release"
+debug = true
+
 # The test profile, used for `cargo test`.
 [profile.test]
 # Enables thin local LTO and some optimizations.

diff --git a/boa_cli/Cargo.toml b/boa_cli/Cargo.toml
@@ -25,9 +25,11 @@ colored.workspace = true
 regex.workspace = true
 phf = { workspace = true, features = ["macros"] }
 pollster.workspace = true
+dhat = { version = "0.3.2", optional = true }
 
 [features]
 default = ["boa_engine/annex-b", "boa_engine/experimental", "boa_engine/intl"]
+dhat = ["dep:dhat"]
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 jemallocator.workspace = true

diff --git a/boa_cli/src/debug/function.rs b/boa_cli/src/debug/function.rs
@@ -1,4 +1,5 @@
 use boa_engine::{
+    js_string,
     object::ObjectInitializer,
     vm::flowgraph::{Direction, Graph},
     Context, JsArgs, JsNativeError, JsObject, JsResult, JsValue, NativeFunction,
@@ -67,8 +68,10 @@ fn flowgraph(_this: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> Js
     let mut direction = Direction::LeftToRight;
     if let Some(arguments) = args.get(1) {
         if let Some(arguments) = arguments.as_object() {
-            format = flowgraph_parse_format_option(&arguments.get("format", context)?)?;
-            direction = flowgraph_parse_direction_option(&arguments.get("direction", context)?)?;
+            format = flowgraph_parse_format_option(&arguments.get(js_string!("format"), context)?)?;
+            direction = flowgraph_parse_direction_option(
+                &arguments.get(js_string!("direction"), context)?,
+            )?;
         } else if value.is_string() {
             format = flowgraph_parse_format_option(value)?;
         } else {
@@ -97,7 +100,7 @@ fn flowgraph(_this: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> Js
         FlowgraphFormat::Mermaid => graph.to_mermaid_format(),
     };
 
-    Ok(JsValue::new(result))
+    Ok(JsValue::new(js_string!(result)))
 }
 
 fn bytecode(_: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> JsResult<JsValue> {
@@ -122,7 +125,7 @@ fn bytecode(_: &JsValue, args: &[JsValue], context: &mut Context<'_>) -> JsResul
         JsNativeError::typ().with_message("native functions do not have bytecode")
     })?;
 
-    Ok(code.to_interned_string(context.interner()).into())
+    Ok(js_string!(code.to_interned_string(context.interner())).into())
 }
 
 fn set_trace_flag_in_function_object(object: &JsObject, value: bool) -> JsResult<()> {
@@ -176,9 +179,21 @@ fn traceable(_: &JsValue, args: &[JsValue], _: &mut Context<'_>) -> JsResult<JsV
 
 pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
     ObjectInitializer::new(context)
-        .function(NativeFunction::from_fn_ptr(flowgraph), "flowgraph", 1)
-        .function(NativeFunction::from_fn_ptr(bytecode), "bytecode", 1)
-        .function(NativeFunction::from_fn_ptr(trace), "trace", 1)
-        .function(NativeFunction::from_fn_ptr(traceable), "traceable", 2)
+        .function(
+            NativeFunction::from_fn_ptr(flowgraph),
+            js_string!("flowgraph"),
+            1,
+        )
+        .function(
+            NativeFunction::from_fn_ptr(bytecode),
+            js_string!("bytecode"),
+            1,
+        )
+        .function(NativeFunction::from_fn_ptr(trace), js_string!("trace"), 1)
+        .function(
+            NativeFunction::from_fn_ptr(traceable),
+            js_string!("traceable"),
+            2,
+        )
         .build()
 }
diff --git a/boa_cli/src/debug/gc.rs b/boa_cli/src/debug/gc.rs
@@ -1,4 +1,6 @@
-use boa_engine::{object::ObjectInitializer, Context, JsObject, JsResult, JsValue, NativeFunction};
+use boa_engine::{
+    js_string, object::ObjectInitializer, Context, JsObject, JsResult, JsValue, NativeFunction,
+};
 
 /// Trigger garbage collection.
 fn collect(_: &JsValue, _: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue> {
@@ -8,6 +10,10 @@ fn collect(_: &JsValue, _: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue>
 
 pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
     ObjectInitializer::new(context)
-        .function(NativeFunction::from_fn_ptr(collect), "collect", 0)
+        .function(
+            NativeFunction::from_fn_ptr(collect),
+            js_string!("collect"),
+            0,
+        )
         .build()
 }
diff --git a/boa_cli/src/debug/limits.rs b/boa_cli/src/debug/limits.rs
@@ -1,4 +1,5 @@
 use boa_engine::{
+    js_string,
     object::{FunctionObjectBuilder, ObjectInitializer},
     property::Attribute,
     Context, JsArgs, JsNativeError, JsObject, JsResult, JsValue, NativeFunction,
@@ -55,13 +56,13 @@ pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
             .build();
     ObjectInitializer::new(context)
         .accessor(
-            "loop",
+            js_string!("loop"),
             Some(get_loop),
             Some(set_loop),
             Attribute::WRITABLE | Attribute::CONFIGURABLE | Attribute::NON_ENUMERABLE,
         )
         .accessor(
-            "recursion",
+            js_string!("recursion"),
             Some(get_recursion),
             Some(set_recursion),
             Attribute::WRITABLE | Attribute::CONFIGURABLE | Attribute::NON_ENUMERABLE,

diff --git a/boa_cli/src/debug/mod.rs b/boa_cli/src/debug/mod.rs
@@ -1,7 +1,7 @@
 // Allow lint so it, doesn't warn about `JsResult<>` unneeded return on functions.
 #![allow(clippy::unnecessary_wraps)]
 
-use boa_engine::{object::ObjectInitializer, property::Attribute, Context, JsObject};
+use boa_engine::{js_string, object::ObjectInitializer, property::Attribute, Context, JsObject};
 
 mod function;
 mod gc;
@@ -22,37 +22,37 @@ fn create_boa_object(context: &mut Context<'_>) -> JsObject {
 
     ObjectInitializer::new(context)
         .property(
-            "function",
+            js_string!("function"),
             function_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
         .property(
-            "object",
+            js_string!("object"),
             object_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
         .property(
-            "shape",
+            js_string!("shape"),
             shape_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
         .property(
-            "optimizer",
+            js_string!("optimizer"),
             optimizer_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
         .property(
-            "gc",
+            js_string!("gc"),
             gc_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
         .property(
-            "realm",
+            js_string!("realm"),
             realm_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
         .property(
-            "limits",
+            js_string!("limits"),
             limits_module,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )
@@ -63,7 +63,7 @@ pub(crate) fn init_boa_debug_object(context: &mut Context<'_>) {
     let boa_object = create_boa_object(context);
     context
         .register_global_property(
-            "$boa",
+            js_string!("$boa"),
             boa_object,
             Attribute::WRITABLE | Attribute::NON_ENUMERABLE | Attribute::CONFIGURABLE,
         )

diff --git a/boa_cli/src/debug/object.rs b/boa_cli/src/debug/object.rs
@@ -1,5 +1,6 @@
 use boa_engine::{
-    object::ObjectInitializer, Context, JsNativeError, JsObject, JsResult, JsValue, NativeFunction,
+    js_string, object::ObjectInitializer, Context, JsNativeError, JsObject, JsResult, JsValue,
+    NativeFunction,
 };
 
 /// Returns objects pointer in memory.
@@ -17,11 +18,11 @@ fn id(_: &JsValue, args: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue> {
     };
 
     let ptr: *const _ = object.as_ref();
-    Ok(format!("0x{:X}", ptr as usize).into())
+    Ok(js_string!(format!("0x{:X}", ptr as usize)).into())
 }
 
 pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
     ObjectInitializer::new(context)
-        .function(NativeFunction::from_fn_ptr(id), "id", 1)
+        .function(NativeFunction::from_fn_ptr(id), js_string!("id"), 1)
         .build()
 }
diff --git a/boa_cli/src/debug/optimizer.rs b/boa_cli/src/debug/optimizer.rs
@@ -1,4 +1,5 @@
 use boa_engine::{
+    js_string,
     object::{FunctionObjectBuilder, ObjectInitializer},
     optimizer::OptimizerOptions,
     property::Attribute,
@@ -71,13 +72,13 @@ pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
             .build();
     ObjectInitializer::new(context)
         .accessor(
-            "constantFolding",
+            js_string!("constantFolding"),
             Some(get_constant_folding),
             Some(set_constant_folding),
             Attribute::WRITABLE | Attribute::CONFIGURABLE | Attribute::NON_ENUMERABLE,
         )
         .accessor(
-            "statistics",
+            js_string!("statistics"),
             Some(get_statistics),
             Some(set_statistics),
             Attribute::WRITABLE | Attribute::CONFIGURABLE | Attribute::NON_ENUMERABLE,

diff --git a/boa_cli/src/debug/realm.rs b/boa_cli/src/debug/realm.rs
@@ -1,4 +1,6 @@
-use boa_engine::{object::ObjectInitializer, Context, JsObject, JsResult, JsValue, NativeFunction};
+use boa_engine::{
+    js_string, object::ObjectInitializer, Context, JsObject, JsResult, JsValue, NativeFunction,
+};
 
 /// Creates a new ECMAScript Realm and returns the global object of the realm.
 fn create(_: &JsValue, _: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue> {
@@ -9,6 +11,6 @@ fn create(_: &JsValue, _: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue>
 
 pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
     ObjectInitializer::new(context)
-        .function(NativeFunction::from_fn_ptr(create), "create", 0)
+        .function(NativeFunction::from_fn_ptr(create), js_string!("create"), 0)
         .build()
 }
diff --git a/boa_cli/src/debug/shape.rs b/boa_cli/src/debug/shape.rs
@@ -23,7 +23,7 @@ fn id(_: &JsValue, args: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue> {
     let object = get_object(args, 0)?;
     let object = object.borrow();
     let shape = object.shape();
-    Ok(format!("0x{:X}", shape.to_addr_usize()).into())
+    Ok(js_string!(format!("0x{:X}", shape.to_addr_usize())).into())
 }
 
 /// Returns object's shape type.
@@ -62,8 +62,8 @@ fn same(_: &JsValue, args: &[JsValue], _: &mut Context<'_>) -> JsResult<JsValue>
 
 pub(super) fn create_object(context: &mut Context<'_>) -> JsObject {
     ObjectInitializer::new(context)
-        .function(NativeFunction::from_fn_ptr(id), "id", 1)
-        .function(NativeFunction::from_fn_ptr(r#type), "type", 1)
-        .function(NativeFunction::from_fn_ptr(same), "same", 2)
+        .function(NativeFunction::from_fn_ptr(id), js_string!("id"), 1)
+        .function(NativeFunction::from_fn_ptr(r#type), js_string!("type"), 1)
+        .function(NativeFunction::from_fn_ptr(same), js_string!("same"), 2)
         .build()
 }