Remove unused PushDeclarativeEnvironment opcode

boa-dev · Oct 2, 2023 · 7481491 · 7481491
1 parent b5ec961
commit 7481491
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 98 deletions.
diff --git a/boa_engine/src/environments/compile.rs b/boa_engine/src/environments/compile.rs
@@ -291,9 +291,4 @@ impl CompileTimeEnvironment {
     pub(crate) fn outer(&self) -> Option<Rc<Self>> {
         self.outer.clone()
     }
-
-    /// Gets the environment index of this environment.
-    pub(crate) const fn environment_index(&self) -> u32 {
-        self.environment_index
-    }
 }
diff --git a/boa_engine/src/environments/runtime/mod.rs b/boa_engine/src/environments/runtime/mod.rs
@@ -309,61 +309,6 @@ impl EnvironmentStack {
         )));
     }
 
-    /// Push a function environment that inherits it's internal slots from the outer function
-    /// environment.
-    ///
-    /// # Panics
-    ///
-    /// Panics if no environment exists on the stack.
-    #[track_caller]
-    pub(crate) fn push_function_inherit(
-        &mut self,
-        compile_environment: Rc<CompileTimeEnvironment>,
-    ) {
-        let num_bindings = compile_environment.num_bindings();
-
-        debug_assert!(
-            self.stack.len() as u32 == compile_environment.environment_index(),
-            "tried to push an invalid compile environment"
-        );
-
-        let (poisoned, with, slots) = {
-            let with = self
-                .stack
-                .last()
-                .expect("can only be called inside a function")
-                .as_declarative()
-                .is_none();
-
-            let (environment, slots) = self
-                .stack
-                .iter()
-                .rev()
-                .find_map(|env| {
-                    if let Some(env) = env.as_declarative() {
-                        if let DeclarativeEnvironmentKind::Function(fun) = env.kind() {
-                            return Some((env, fun.slots().clone()));
-                        }
-                    }
-                    None
-                })
-                .expect("can only be called inside a function");
-            (environment.poisoned(), with || environment.with(), slots)
-        };
-
-        self.stack.push(Environment::Declarative(Gc::new(
-            DeclarativeEnvironment::new(
-                DeclarativeEnvironmentKind::Function(FunctionEnvironment::new(
-                    num_bindings,
-                    poisoned,
-                    with,
-                    slots,
-                )),
-                compile_environment,
-            ),
-        )));
-    }
-
     /// Push a module environment on the environments stack.
     ///
     /// # Panics

diff --git a/boa_engine/src/vm/code_block.rs b/boa_engine/src/vm/code_block.rs
@@ -349,9 +349,6 @@ impl CodeBlock {
             | Instruction::ConcatToString { value_count: value } => value.value().to_string(),
             Instruction::PushDeclarativeEnvironment {
                 compile_environments_index,
-            }
-            | Instruction::PushFunctionEnvironment {
-                compile_environments_index,
             } => compile_environments_index.to_string(),
             Instruction::CopyDataProperties {
                 excluded_key_count: value1,
@@ -632,7 +629,8 @@ impl CodeBlock {
             | Instruction::Reserved54
             | Instruction::Reserved55
             | Instruction::Reserved56
-            | Instruction::Reserved57 => unreachable!("Reserved opcodes are unrechable"),
+            | Instruction::Reserved57
+            | Instruction::Reserved58 => unreachable!("Reserved opcodes are unrechable"),
         }
     }
 }

diff --git a/boa_engine/src/vm/flowgraph/mod.rs b/boa_engine/src/vm/flowgraph/mod.rs
@@ -226,8 +226,7 @@ impl CodeBlock {
                     graph.add_node(previous_pc, NodeShape::None, label.into(), Color::None);
                     graph.add_edge(previous_pc, pc, None, Color::None, EdgeStyle::Line);
                 }
-                Instruction::PushDeclarativeEnvironment { .. }
-                | Instruction::PushFunctionEnvironment { .. } => {
+                Instruction::PushDeclarativeEnvironment { .. } => {
                     let random = rand::random();
 
                     graph.add_node(
@@ -523,7 +522,8 @@ impl CodeBlock {
                 | Instruction::Reserved54
                 | Instruction::Reserved55
                 | Instruction::Reserved56
-                | Instruction::Reserved57 => unreachable!("Reserved opcodes are unrechable"),
+                | Instruction::Reserved57
+                | Instruction::Reserved58 => unreachable!("Reserved opcodes are unrechable"),
             }
         }
 

diff --git a/boa_engine/src/vm/opcode/mod.rs b/boa_engine/src/vm/opcode/mod.rs
@@ -1750,13 +1750,6 @@ generate_opcodes! {
     /// Stack: object **=>**
     PushObjectEnvironment,
 
-    /// Push a function environment.
-    ///
-    /// Operands: compile_environments_index: `u32`
-    ///
-    /// Stack: **=>**
-    PushFunctionEnvironment { compile_environments_index: u32 },
-
     /// Pop the current environment.
     ///
     /// Operands:
@@ -2178,6 +2171,8 @@ generate_opcodes! {
     Reserved56 => Reserved,
     /// Reserved [`Opcode`].
     Reserved57 => Reserved,
+    /// Reserved [`Opcode`].
+    Reserved58 => Reserved,
 }
 
 /// Specific opcodes for bindings.

diff --git a/boa_engine/src/vm/opcode/push/environment.rs b/boa_engine/src/vm/opcode/push/environment.rs
@@ -26,30 +26,6 @@ impl Operation for PushDeclarativeEnvironment {
     }
 }
 
-/// `PushFunctionEnvironment` implements the Opcode Operation for `Opcode::PushFunctionEnvironment`
-///
-/// Operation:
-///  - Push a function environment.
-#[derive(Debug, Clone, Copy)]
-pub(crate) struct PushFunctionEnvironment;
-
-impl Operation for PushFunctionEnvironment {
-    const NAME: &'static str = "PushFunctionEnvironment";
-    const INSTRUCTION: &'static str = "INST - PushFunctionEnvironment";
-
-    fn execute(context: &mut Context<'_>) -> JsResult<CompletionType> {
-        let compile_environments_index = context.vm.read::<u32>();
-        let compile_environment = context.vm.frame().code_block.compile_environments
-            [compile_environments_index as usize]
-            .clone();
-        context
-            .vm
-            .environments
-            .push_function_inherit(compile_environment);
-        Ok(CompletionType::Normal)
-    }
-}
-
 /// `PushObjectEnvironment` implements the Opcode Operation for `Opcode::PushObjectEnvironment`
 ///
 /// Operation: