Remove unneeded opcode

boa-dev · Dec 3, 2021 · 1b05e64 · 1b05e64
1 parent 2b797a4
commit 1b05e64
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/boa/src/bytecompiler.rs b/boa/src/bytecompiler.rs
@@ -690,7 +690,6 @@ impl ByteCompiler {
                             PropertyName::Computed(name_node) => {
                                 self.compile_stmt(name_node, true);
                                 self.compile_stmt(node, true);
-                                self.emit_opcode(Opcode::Swap2);
                                 self.emit_opcode(Opcode::DefineOwnPropertyByValue);
                             }
                         },
@@ -706,7 +705,6 @@ impl ByteCompiler {
                                     PropertyName::Computed(name_node) => {
                                         self.compile_stmt(name_node, true);
                                         self.compile_stmt(&func.clone().into(), true);
-                                        self.emit_opcode(Opcode::Swap2);
                                         self.emit_opcode(Opcode::SetPropertyGetterByValue);
                                     }
                                 },
@@ -720,7 +718,6 @@ impl ByteCompiler {
                                     PropertyName::Computed(name_node) => {
                                         self.compile_stmt(name_node, true);
                                         self.compile_stmt(&func.clone().into(), true);
-                                        self.emit_opcode(Opcode::Swap2);
                                         self.emit_opcode(Opcode::SetPropertySetterByValue);
                                     }
                                 },
@@ -734,7 +731,6 @@ impl ByteCompiler {
                                     PropertyName::Computed(name_node) => {
                                         self.compile_stmt(name_node, true);
                                         self.compile_stmt(&func.clone().into(), true);
-                                        self.emit_opcode(Opcode::Swap2);
                                         self.emit_opcode(Opcode::DefineOwnPropertyByValue);
                                     }
                                 },
@@ -750,7 +746,6 @@ impl ByteCompiler {
                                         PropertyName::Computed(name_node) => {
                                             self.compile_stmt(name_node, true);
                                             self.emit_opcode(Opcode::PushUndefined);
-                                            self.emit_opcode(Opcode::Swap2);
                                             self.emit_opcode(Opcode::DefineOwnPropertyByValue);
                                         }
                                     }
@@ -767,7 +762,6 @@ impl ByteCompiler {
                                         PropertyName::Computed(name_node) => {
                                             self.compile_stmt(name_node, true);
                                             self.emit_opcode(Opcode::PushUndefined);
-                                            self.emit_opcode(Opcode::Swap2);
                                             self.emit_opcode(Opcode::DefineOwnPropertyByValue);
                                         }
                                     }
@@ -784,7 +778,6 @@ impl ByteCompiler {
                                         PropertyName::Computed(name_node) => {
                                             self.compile_stmt(name_node, true);
                                             self.emit_opcode(Opcode::PushUndefined);
-                                            self.emit_opcode(Opcode::Swap2);
                                             self.emit_opcode(Opcode::DefineOwnPropertyByValue);
                                         }
                                     }

diff --git a/boa/src/vm/code_block.rs b/boa/src/vm/code_block.rs
@@ -194,7 +194,6 @@ impl CodeBlock {
             Opcode::Pop
             | Opcode::Dup
             | Opcode::Swap
-            | Opcode::Swap2
             | Opcode::PushZero
             | Opcode::PushOne
             | Opcode::PushNaN

diff --git a/boa/src/vm/mod.rs b/boa/src/vm/mod.rs
@@ -125,15 +125,6 @@ impl Context {
                 self.vm.push(first);
                 self.vm.push(second);
             }
-            Opcode::Swap2 => {
-                let first = self.vm.pop();
-                let second = self.vm.pop();
-                let third = self.vm.pop();
-
-                self.vm.push(first);
-                self.vm.push(second);
-                self.vm.push(third);
-            }
             Opcode::PushUndefined => self.vm.push(JsValue::undefined()),
             Opcode::PushNull => self.vm.push(JsValue::null()),
             Opcode::PushTrue => self.vm.push(true),
@@ -523,9 +514,9 @@ impl Context {
                 )?;
             }
             Opcode::DefineOwnPropertyByValue => {
-                let object = self.vm.pop();
-                let key = self.vm.pop();
                 let value = self.vm.pop();
+                let key = self.vm.pop();
+                let object = self.vm.pop();
                 let object = if let Some(object) = object.as_object() {
                     object.clone()
                 } else {
@@ -571,9 +562,9 @@ impl Context {
                 )?;
             }
             Opcode::SetPropertyGetterByValue => {
-                let object = self.vm.pop();
-                let key = self.vm.pop();
                 let value = self.vm.pop();
+                let key = self.vm.pop();
+                let object = self.vm.pop();
                 let object = object.to_object(self)?;
                 let name = key.to_property_key(self)?;
                 let set = object
@@ -617,9 +608,9 @@ impl Context {
                 )?;
             }
             Opcode::SetPropertySetterByValue => {
-                let object = self.vm.pop();
-                let key = self.vm.pop();
                 let value = self.vm.pop();
+                let key = self.vm.pop();
+                let object = self.vm.pop();
                 let object = object.to_object(self)?;
                 let name = key.to_property_key(self)?;
                 let get = object

diff --git a/boa/src/vm/opcode.rs b/boa/src/vm/opcode.rs
@@ -25,13 +25,6 @@ pub enum Opcode {
     /// Stack: v1, v2 **=>** v2, v1
     Swap,
 
-    /// Swap the top value and the third value of the stack.
-    ///
-    /// Operands:
-    ///
-    /// Stack: v1, v2, v3 **=>** v3, v2, v1
-    Swap2,
-
     /// Push integer `0` on the stack.
     ///
     /// Operands:
@@ -800,7 +793,6 @@ impl Opcode {
             Opcode::Pop => "Pop",
             Opcode::Dup => "Dup",
             Opcode::Swap => "Swap",
-            Opcode::Swap2 => "Swap2",
             Opcode::PushZero => "PushZero",
             Opcode::PushOne => "PushOne",
             Opcode::PushInt8 => "PushInt8",