Apply suggestions

boa-dev · May 7, 2023 · d547395 · d547395
1 parent 58dbd4c
commit d547395
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/boa_engine/src/vm/call_frame/env_stack.rs b/boa_engine/src/vm/call_frame/env_stack.rs
@@ -193,9 +193,9 @@ impl EnvStackEntry {
     }
 
     /// Set the loop return value for the current `EnvStackEntry`.
-    pub(crate) fn set_loop_return_value(&mut self, value: &JsValue) -> bool {
+    pub(crate) fn set_loop_return_value(&mut self, value: JsValue) -> bool {
         if let EnvEntryKind::Loop { value: v, .. } = &mut self.kind {
-            *v = value.clone();
+            *v = value;
             true
         } else {
             false

diff --git a/boa_engine/src/vm/opcode/control_flow/break.rs b/boa_engine/src/vm/opcode/control_flow/break.rs
@@ -33,22 +33,22 @@ impl Operation for Break {
             };
 
             if found_target {
-                set_loop_result = env_entry.set_loop_return_value(&value);
+                set_loop_result = env_entry.set_loop_return_value(value.clone());
                 continue;
             }
 
             if (jump_address == env_entry.exit_address())
                 || (env_entry.is_finally_env() && jump_address == env_entry.start_address())
             {
                 found_target = true;
-                set_loop_result = env_entry.set_loop_return_value(&value);
+                set_loop_result = env_entry.set_loop_return_value(value.clone());
                 continue;
             }
 
             // Checks for the break if we have jumped from inside of a finally block
             if jump_address == env_entry.exit_address() {
                 found_target = true;
-                set_loop_result = env_entry.set_loop_return_value(&value);
+                set_loop_result = env_entry.set_loop_return_value(value.clone());
                 continue;
             }
             envs_to_pop += env_entry.env_num();

diff --git a/boa_engine/src/vm/opcode/control_flow/continue.rs b/boa_engine/src/vm/opcode/control_flow/continue.rs
@@ -37,7 +37,7 @@ impl Operation for Continue {
             };
 
             if found_target {
-                set_loop_result = env_entry.set_loop_return_value(&value);
+                set_loop_result = env_entry.set_loop_return_value(value.clone());
                 continue;
             }
 
@@ -48,15 +48,15 @@ impl Operation for Continue {
                 || (jump_address == target_address && jump_address == env_entry.start_address())
             {
                 found_target = true;
-                set_loop_result = env_entry.set_loop_return_value(&value);
+                set_loop_result = env_entry.set_loop_return_value(value.clone());
                 continue;
             }
 
             envs_to_pop += env_entry.env_num();
             // The below check determines whether we have continued from inside of a finally block.
             if jump_address > target_address && jump_address == env_entry.exit_address() {
                 found_target = true;
-                set_loop_result = env_entry.set_loop_return_value(&value);
+                set_loop_result = env_entry.set_loop_return_value(value.clone());
                 context.vm.frame_mut().env_stack.pop();
                 continue;
             }

diff --git a/boa_engine/src/vm/opcode/iteration/loop_ops.rs b/boa_engine/src/vm/opcode/iteration/loop_ops.rs
@@ -80,7 +80,6 @@ impl Operation for LoopEnd {
     const INSTRUCTION: &'static str = "INST - LoopEnd";
 
     fn execute(context: &mut Context<'_>) -> JsResult<CompletionType> {
-        //cleanup_loop_environment(context);
         let mut envs_to_pop = 0_usize;
         while let Some(env_entry) = context.vm.frame_mut().env_stack.pop() {
             envs_to_pop += env_entry.env_num();
@@ -118,7 +117,7 @@ impl Operation for LoopUpdateReturnValue {
             .env_stack
             .last_mut()
             .expect("loop environment must be present")
-            .set_loop_return_value(&value);
+            .set_loop_return_value(value);
         Ok(CompletionType::Normal)
     }
 }