Remove unused class environments

boa-dev · Oct 1, 2023 · 40aa140 · 40aa140
1 parent 8fd4744
commit 40aa140
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 284 deletions.
diff --git a/boa_engine/src/builtins/function/mod.rs b/boa_engine/src/builtins/function/mod.rs
@@ -174,9 +174,6 @@ pub(crate) enum FunctionKind {
         /// The `[[PrivateMethods]]` internal slot.
         private_methods: ThinVec<(PrivateName, PrivateElement)>,
 
-        /// The class object that this function is associated with.
-        class_object: Option<JsObject>,
-
         /// The `[[ScriptOrModule]]` internal slot.
         script_or_module: Option<ActiveRunnable>,
     },
@@ -192,9 +189,6 @@ pub(crate) enum FunctionKind {
         /// The `[[HomeObject]]` internal slot.
         home_object: Option<JsObject>,
 
-        /// The class object that this function is associated with.
-        class_object: Option<JsObject>,
-
         /// The `[[ScriptOrModule]]` internal slot.
         script_or_module: Option<ActiveRunnable>,
     },
@@ -210,9 +204,6 @@ pub(crate) enum FunctionKind {
         /// The `[[HomeObject]]` internal slot.
         home_object: Option<JsObject>,
 
-        /// The class object that this function is associated with.
-        class_object: Option<JsObject>,
-
         /// The `[[ScriptOrModule]]` internal slot.
         script_or_module: Option<ActiveRunnable>,
     },
@@ -228,9 +219,6 @@ pub(crate) enum FunctionKind {
         /// The `[[HomeObject]]` internal slot.
         home_object: Option<JsObject>,
 
-        /// The class object that this function is associated with.
-        class_object: Option<JsObject>,
-
         /// The `[[ScriptOrModule]]` internal slot.
         script_or_module: Option<ActiveRunnable>,
     },
@@ -273,7 +261,6 @@ unsafe impl Trace for FunctionKind {
                 home_object,
                 fields,
                 private_methods,
-                class_object,
                 script_or_module,
                 ..
             } => {
@@ -286,16 +273,14 @@ unsafe impl Trace for FunctionKind {
                 for (_, elem) in private_methods {
                     mark(elem);
                 }
-                mark(class_object);
                 mark(script_or_module);
             }
-            Self::Async { code, environments, home_object, class_object, script_or_module }
-            | Self::Generator { code, environments, home_object, class_object, script_or_module}
-            | Self::AsyncGenerator { code, environments, home_object, class_object, script_or_module} => {
+            Self::Async { code, environments, home_object, script_or_module }
+            | Self::Generator { code, environments, home_object, script_or_module}
+            | Self::AsyncGenerator { code, environments, home_object, script_or_module} => {
                 mark(code);
                 mark(environments);
                 mark(home_object);
-                mark(class_object);
                 mark(script_or_module);
             }
         }
@@ -427,17 +412,6 @@ impl Function {
         }
     }
 
-    ///  Sets the class object.
-    pub(crate) fn set_class_object(&mut self, object: JsObject) {
-        match &mut self.kind {
-            FunctionKind::Ordinary { class_object, .. }
-            | FunctionKind::Async { class_object, .. }
-            | FunctionKind::Generator { class_object, .. }
-            | FunctionKind::AsyncGenerator { class_object, .. } => *class_object = Some(object),
-            FunctionKind::Native { .. } => {}
-        }
-    }
-
     /// Gets the `Realm` from where this function originates.
     #[must_use]
     pub const fn realm(&self) -> &Realm {

diff --git a/boa_engine/src/bytecompiler/class.rs b/boa_engine/src/bytecompiler/class.rs
diff --git a/boa_engine/src/bytecompiler/function.rs b/boa_engine/src/bytecompiler/function.rs
@@ -21,7 +21,6 @@ pub(crate) struct FunctionCompiler {
     strict: bool,
     arrow: bool,
     binding_identifier: Option<Sym>,
-    class_name: Option<Sym>,
 }
 
 impl FunctionCompiler {
@@ -34,7 +33,6 @@ impl FunctionCompiler {
             strict: false,
             arrow: false,
             binding_identifier: None,
-            class_name: None,
         }
     }
 
@@ -79,12 +77,6 @@ impl FunctionCompiler {
         self
     }
 
-    /// Indicate if the function has a class associated with it.
-    pub(crate) const fn class_name(mut self, class_name: Sym) -> Self {
-        self.class_name = Some(class_name);
-        self
-    }
-
     /// Compile a function statement list and it's parameters into bytecode.
     pub(crate) fn compile(
         mut self,
@@ -106,11 +98,6 @@ impl FunctionCompiler {
             compiler.this_mode = ThisMode::Lexical;
         }
 
-        if let Some(class_name) = self.class_name {
-            compiler.push_compile_environment(false);
-            compiler.create_immutable_binding(class_name.into(), true);
-        }
-
         if let Some(binding_identifier) = self.binding_identifier {
             compiler.code_block_flags |= CodeBlockFlags::HAS_BINDING_IDENTIFIER;
             compiler.push_compile_environment(false);
@@ -184,10 +171,6 @@ impl FunctionCompiler {
             compiler.pop_compile_environment();
         }
 
-        if self.class_name.is_some() {
-            compiler.pop_compile_environment();
-        }
-
         compiler.params = parameters.clone();
 
         Gc::new(compiler.finish())

diff --git a/boa_engine/src/bytecompiler/mod.rs b/boa_engine/src/bytecompiler/mod.rs
@@ -1378,7 +1378,7 @@ impl<'ctx, 'host> ByteCompiler<'ctx, 'host> {
     }
 
     /// Compile a class method AST Node into bytecode.
-    fn method(&mut self, function: FunctionSpec<'_>, class_name: Sym) {
+    fn method(&mut self, function: FunctionSpec<'_>) {
         let (generator, r#async, arrow) = (
             function.kind.is_generator(),
             function.kind.is_async(),
@@ -1409,7 +1409,6 @@ impl<'ctx, 'host> ByteCompiler<'ctx, 'host> {
             .strict(true)
             .arrow(arrow)
             .binding_identifier(binding_identifier)
-            .class_name(class_name)
             .compile(
                 parameters,
                 body,

diff --git a/boa_engine/src/vm/code_block.rs b/boa_engine/src/vm/code_block.rs
@@ -468,7 +468,6 @@ impl CodeBlock {
             | Instruction::PushClassPrototype
             | Instruction::SetClassPrototype
             | Instruction::SetHomeObject
-            | Instruction::SetHomeObjectClass
             | Instruction::Add
             | Instruction::Sub
             | Instruction::Div
@@ -632,7 +631,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"),
         }
     }
 }
@@ -774,7 +774,6 @@ pub(crate) fn create_function_object(
                 code,
                 environments: context.vm.environments.clone(),
                 home_object: None,
-                class_object: None,
                 script_or_module,
             },
             context.realm().clone(),
@@ -788,7 +787,6 @@ pub(crate) fn create_function_object(
                 home_object: None,
                 fields: ThinVec::new(),
                 private_methods: ThinVec::new(),
-                class_object: None,
                 script_or_module,
             },
             context.realm().clone(),
@@ -853,7 +851,6 @@ pub(crate) fn create_function_object_fast(
             code,
             environments: context.vm.environments.clone(),
             home_object: None,
-            class_object: None,
             script_or_module,
         }
     } else {
@@ -864,7 +861,6 @@ pub(crate) fn create_function_object_fast(
             home_object: None,
             fields: ThinVec::new(),
             private_methods: ThinVec::new(),
-            class_object: None,
             script_or_module,
         }
     };
@@ -959,7 +955,6 @@ pub(crate) fn create_generator_function_object(
                 code,
                 environments: context.vm.environments.clone(),
                 home_object: None,
-                class_object: None,
                 script_or_module,
             },
             context.realm().clone(),
@@ -975,7 +970,6 @@ pub(crate) fn create_generator_function_object(
                 code,
                 environments: context.vm.environments.clone(),
                 home_object: None,
-                class_object: None,
                 script_or_module,
             },
             context.realm().clone(),
@@ -1027,8 +1021,7 @@ impl JsObject {
 
         context.enter_realm(realm);
 
-        let (code, mut environments, class_object, script_or_module) = match function_object.kind()
-        {
+        let (code, mut environments, script_or_module) = match function_object.kind() {
             FunctionKind::Native {
                 function,
                 constructor,
@@ -1053,7 +1046,6 @@ impl JsObject {
             FunctionKind::Ordinary {
                 code,
                 environments,
-                class_object,
                 script_or_module,
                 ..
             } => {
@@ -1064,39 +1056,26 @@ impl JsObject {
                         .with_realm(context.realm().clone())
                         .into());
                 }
-                (
-                    code,
-                    environments.clone(),
-                    class_object.clone(),
-                    script_or_module.clone(),
-                )
+                (code, environments.clone(), script_or_module.clone())
             }
             FunctionKind::Async {
                 code,
                 environments,
-                class_object,
                 script_or_module,
                 ..
             }
             | FunctionKind::Generator {
                 code,
                 environments,
-                class_object,
                 script_or_module,
                 ..
             }
             | FunctionKind::AsyncGenerator {
                 code,
                 environments,
-                class_object,
                 script_or_module,
                 ..
-            } => (
-                code.clone(),
-                environments.clone(),
-                class_object.clone(),
-                script_or_module.clone(),
-            ),
+            } => (code.clone(), environments.clone(), script_or_module.clone()),
         };
 
         drop(object);
@@ -1123,18 +1102,6 @@ impl JsObject {
 
         let mut last_env = code.compile_environments.len() - 1;
 
-        if let Some(class_object) = class_object {
-            let index = context
-                .vm
-                .environments
-                .push_lexical(code.compile_environments[last_env].clone());
-            context
-                .vm
-                .environments
-                .put_lexical_value(index, 0, class_object.into());
-            last_env -= 1;
-        }
-
         if code.has_binding_identifier() {
             let index = context
                 .vm

diff --git a/boa_engine/src/vm/flowgraph/mod.rs b/boa_engine/src/vm/flowgraph/mod.rs
@@ -358,7 +358,6 @@ impl CodeBlock {
                 | Instruction::PushClassPrototype
                 | Instruction::SetClassPrototype
                 | Instruction::SetHomeObject
-                | Instruction::SetHomeObjectClass
                 | Instruction::Add
                 | Instruction::Sub
                 | Instruction::Div
@@ -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/define/class/getter.rs b/boa_engine/src/vm/opcode/define/class/getter.rs
@@ -1,6 +1,5 @@
 use crate::{
     builtins::function::set_function_name,
-    object::CONSTRUCTOR,
     property::PropertyDescriptor,
     vm::{opcode::Operation, CompletionType},
     Context, JsResult, JsString,
@@ -29,7 +28,6 @@ impl DefineClassStaticGetterByName {
                 .as_function_mut()
                 .expect("method must be function object");
             function_mut.set_home_object(class.clone());
-            function_mut.set_class_object(class.clone());
         }
         let set = class
             .__get_own_property__(&key, context)?
@@ -93,13 +91,6 @@ impl DefineClassGetterByName {
                 .as_function_mut()
                 .expect("method must be function object");
             function_mut.set_home_object(class_proto.clone());
-            let class = class_proto
-                .get(CONSTRUCTOR, context)
-                .expect("class prototype must have constructor")
-                .as_object()
-                .expect("class must be object")
-                .clone();
-            function_mut.set_class_object(class);
         }
         let set = class_proto
             .__get_own_property__(&key, context)?
@@ -169,7 +160,6 @@ impl Operation for DefineClassStaticGetterByValue {
                 .as_function_mut()
                 .expect("method must be function object");
             function_mut.set_home_object(class.clone());
-            function_mut.set_class_object(class.clone());
         }
         let set = class
             .__get_own_property__(&key, context)?
@@ -219,13 +209,6 @@ impl Operation for DefineClassGetterByValue {
                 .as_function_mut()
                 .expect("method must be function object");
             function_mut.set_home_object(class_proto.clone());
-            let class = class_proto
-                .get(CONSTRUCTOR, context)
-                .expect("class prototype must have constructor")
-                .as_object()
-                .expect("class must be object")
-                .clone();
-            function_mut.set_class_object(class);
         }
         let set = class_proto
             .__get_own_property__(&key, context)?