fix(vm/opcode/push,environment,templates,generator,await,new): convert panics to EngineError::Panic using js_expect

Author: KaustubhOG

core/engine/src/vm/opcode/await/mod.rs

@@ -5,6 +5,7 @@ use crate::{
         Promise, async_generator::AsyncGenerator, generator::GeneratorContext,
         promise::PromiseCapability,
     },
+    error::PanicError,
     js_string,
     native_function::NativeFunction,
     object::FunctionObjectBuilder,
@@ -34,9 +35,15 @@ impl Await {
             value.clone(),
             context,
         ) {
-            Ok(promise) => promise
-                .downcast::<Promise>()
-                .expect("%Promise% constructor must return a `Promise` object"),
+            Ok(promise) => match promise.downcast::<Promise>().ok() {
+                Some(v) => v,
+                None => {
+                    return context.handle_error(
+                        PanicError::new("%Promise% constructor must return a `Promise` object")
+                            .into(),
+                    );
+                }
+            },
             Err(err) => return context.handle_error(err),
         };
 
@@ -61,7 +68,7 @@ impl Await {
                     // b. Suspend prevContext.
                     // c. Push asyncContext onto the execution context stack; asyncContext is now the running execution context.
                     // d. Resume the suspended evaluation of asyncContext using NormalCompletion(value) as the result of the operation that suspended it.
-                    let mut r#gen = captures.take().expect("should only run once");
+                    let mut r#gen = captures.take().js_expect("should only run once")?;
 
                     // NOTE: We need to get the object before resuming, since it could clear the stack.
                     let async_generator = r#gen.async_generator_object()?;
@@ -75,7 +82,7 @@ impl Await {
                     if let Some(async_generator) = async_generator {
                         async_generator
                             .downcast_mut::<AsyncGenerator>()
-                            .expect("must be async generator")
+                            .js_expect("must be async generator")?
                             .context = Some(r#gen);
                     }
 
@@ -102,7 +109,7 @@ impl Await {
                     // d. Resume the suspended evaluation of asyncContext using ThrowCompletion(reason) as the result of the operation that suspended it.
                     // e. Assert: When we reach this step, asyncContext has already been removed from the execution context stack and prevContext is the currently running execution context.
                     // f. Return undefined.
-                    let mut r#gen = captures.take().expect("should only run once");
+                    let mut r#gen = captures.take().js_expect("should only run once")?;
 
                     // NOTE: We need to get the object before resuming, since it could clear the stack.
                     let async_generator = r#gen.async_generator_object()?;
@@ -116,7 +123,7 @@ impl Await {
                     if let Some(async_generator) = async_generator {
                         async_generator
                             .downcast_mut::<AsyncGenerator>()
-                            .expect("must be async generator")
+                            .js_expect("must be async generator")?
                             .context = Some(r#gen);
                     }
 

core/engine/src/vm/opcode/environment/mod.rs

@@ -71,7 +71,7 @@ impl This {
             .unwrap_or(context.realm().global_this().clone().into());
         context.vm.frame_mut().flags |= CallFrameFlags::THIS_VALUE_CACHED;
         context.vm.stack.set_this(
-            context.vm.frames.last().expect("frame must exist"),
+            context.vm.frames.last().js_expect("frame must exist")?,
             this.clone(),
         );
         context.vm.set_register(dst.into(), this);
@@ -141,13 +141,13 @@ impl SuperCall {
                 .environments
                 .get_this_environment(frame.realm.environment())
                 .as_function()
-                .expect("super call must be in function environment")
+                .js_expect("super call must be in function environment")?
         };
 
         let new_target = this_env
             .slots()
             .new_target()
-            .expect("must have new.target")
+            .js_expect("must have new.target")?
             .clone();
 
         context.vm.stack.push(new_target);
@@ -179,12 +179,12 @@ impl SuperCallSpread {
         let arguments_array = context.vm.stack.pop();
         let arguments_array_object = arguments_array
             .as_object()
-            .expect("arguments array in call spread function must be an object");
+            .js_expect("arguments array in call spread function must be an object")?;
         let arguments = arguments_array_object
             .borrow()
             .properties()
             .to_dense_indexed_properties()
-            .expect("arguments array in call spread function must be dense");
+            .js_expect("arguments array in call spread function must be dense")?;
 
         let super_constructor = context.vm.stack.pop();
 
@@ -207,13 +207,13 @@ impl SuperCallSpread {
                 .environments
                 .get_this_environment(frame.realm.environment())
                 .as_function()
-                .expect("super call must be in function environment")
+                .js_expect("super call must be in function environment")?
         };
 
         let new_target = this_env
             .slots()
             .new_target()
-            .expect("must have new.target")
+            .js_expect("must have new.target")?
             .clone();
 
         context.vm.stack.push(new_target);
@@ -247,18 +247,18 @@ impl SuperCallDerived {
                 .environments
                 .get_this_environment(frame.realm.environment())
                 .as_function()
-                .expect("super call must be in function environment")
+                .js_expect("super call must be in function environment")?
         };
         let new_target = this_env
             .slots()
             .new_target()
-            .expect("must have new target")
+            .js_expect("must have new target")?
             .clone();
         let active_function = this_env.slots().function_object().clone();
         let super_constructor = active_function
             .__get_prototype_of__(&mut InternalMethodPropertyContext::new(context))
-            .expect("function object must have prototype")
-            .expect("function object must have prototype");
+            .js_expect("function object must have prototype")?
+            .js_expect("function object must have prototype")?;
 
         if !super_constructor.is_constructor() {
             return Err(JsNativeError::typ()
@@ -304,7 +304,7 @@ impl BindThisValue {
             .vm
             .get_register(value.into())
             .as_object()
-            .expect("construct result should be an object")
+            .js_expect("construct result should be an object")?
             .clone();
 
         // 7. Let thisER be GetThisEnvironment().
@@ -314,7 +314,7 @@ impl BindThisValue {
                 .environments
                 .get_this_environment(frame.realm.environment())
                 .as_function()
-                .expect("super call must be in function environment")
+                .js_expect("super call must be in function environment")?
         };
 
         // 8. Perform ? thisER.BindThisValue(result).

core/engine/src/vm/opcode/generator/mod.rs

@@ -1,11 +1,12 @@
 pub(crate) mod yield_stm;
 
 use crate::{
-    Context, JsObject, JsResult,
+    Context, JsExpect, JsObject, JsResult,
     builtins::{
         async_generator::{AsyncGenerator as NativeAsyncGenerator, AsyncGeneratorState},
         generator::{Generator as NativeGenerator, GeneratorContext, GeneratorState},
     },
+    error::PanicError,
     object::PROTOTYPE,
     vm::{CompletionRecord, opcode::Operation},
 };
@@ -23,14 +24,19 @@ pub(crate) struct Generator;
 impl Generator {
     #[inline(always)]
     pub(super) fn operation((): (), context: &mut Context) -> ControlFlow<CompletionRecord> {
-        let active_function = context.vm.stack.get_function(context.vm.frame());
-        let this_function_object =
-            active_function.expect("active function should be set to the generator");
+        let this_function_object = match context.vm.stack.get_function(context.vm.frame()) {
+            Some(v) => v,
+            None => {
+                return context.handle_error(
+                    PanicError::new("active function should be set to the generator").into(),
+                );
+            }
+        };
 
         let proto = this_function_object
             .get(PROTOTYPE, context)
-            .expect("generator must have a prototype property")
-            .as_object()
+            .ok()
+            .and_then(|v| v.as_object())
             .unwrap_or_else(|| context.intrinsics().objects().generator());
 
         let generator = JsObject::from_proto_and_data_with_shared_shape(
@@ -67,14 +73,19 @@ pub(crate) struct AsyncGenerator;
 impl AsyncGenerator {
     #[inline(always)]
     pub(super) fn operation((): (), context: &mut Context) -> ControlFlow<CompletionRecord> {
-        let active_function = context.vm.stack.get_function(context.vm.frame());
-        let this_function_object =
-            active_function.expect("active function should be set to the generator");
+        let this_function_object = match context.vm.stack.get_function(context.vm.frame()) {
+            Some(v) => v,
+            None => {
+                return context.handle_error(
+                    PanicError::new("active function should be set to the generator").into(),
+                );
+            }
+        };
 
         let proto = this_function_object
             .get(PROTOTYPE, context)
-            .expect("generator must have a prototype property")
-            .as_object()
+            .ok()
+            .and_then(|v| v.as_object())
             .unwrap_or_else(|| context.intrinsics().objects().async_generator());
 
         let generator = JsObject::from_proto_and_data_with_shared_shape(
@@ -115,9 +126,10 @@ impl AsyncGeneratorClose {
         let generator = context
             .vm
             .async_generator_object()
-            .expect("There should be a object")
+            .js_expect("There should be a object")?
             .downcast::<NativeAsyncGenerator>()
-            .expect("must be async generator");
+            .ok()
+            .js_expect("must be async generator")?;
 
         let mut r#gen = generator.borrow_mut();
 

core/engine/src/vm/opcode/generator/yield_stm.rs

@@ -3,6 +3,7 @@ use std::ops::ControlFlow;
 use crate::{
     Context, JsValue,
     builtins::async_generator::{AsyncGenerator, AsyncGeneratorState},
+    error::PanicError,
     vm::{
         CompletionRecord, GeneratorResumeKind,
         opcode::{Operation, RegisterOperand},
@@ -54,13 +55,24 @@ impl AsyncGeneratorYield {
         // 2. Assert: genContext is the execution context of a generator.
         // 3. Let generator be the value of the Generator component of genContext.
         // 4. Assert: GetGeneratorKind() is async.
-        let async_generator_object = context
-            .vm
-            .async_generator_object()
-            .expect("`AsyncGeneratorYield` must only be called inside async generators");
-        let async_generator_object = async_generator_object
-            .downcast::<AsyncGenerator>()
-            .expect("must be async generator object");
+        let async_generator_object = match context.vm.async_generator_object() {
+            Some(v) => v,
+            None => {
+                return context.handle_error(
+                    PanicError::new(
+                        "`AsyncGeneratorYield` must only be called inside async generators",
+                    )
+                    .into(),
+                );
+            }
+        };
+        let async_generator_object = match async_generator_object.downcast::<AsyncGenerator>() {
+            Ok(v) => v,
+            Err(_) => {
+                return context
+                    .handle_error(PanicError::new("must be async generator object").into());
+            }
+        };
 
         // 5. Let completion be NormalCompletion(value).
         let value = context.vm.get_register(value.into());

core/engine/src/vm/opcode/new/mod.rs

@@ -1,5 +1,5 @@
 use super::IndexOperand;
-use crate::{Context, JsResult, error::JsNativeError, vm::opcode::Operation};
+use crate::{Context, JsExpect, JsResult, error::JsNativeError, vm::opcode::Operation};
 
 /// `New` implements the Opcode Operation for `Opcode::New`
 ///
@@ -48,12 +48,12 @@ impl NewSpread {
         let arguments_array = context.vm.stack.pop();
         let arguments_array_object = arguments_array
             .as_object()
-            .expect("arguments array in call spread function must be an object");
+            .js_expect("arguments array in call spread function must be an object")?;
         let arguments = arguments_array_object
             .borrow()
             .properties()
             .to_dense_indexed_properties()
-            .expect("arguments array in call spread function must be dense");
+            .js_expect("arguments array in call spread function must be dense")?;
 
         let func = context.vm.stack.pop();
 

core/engine/src/vm/opcode/push/array.rs

@@ -1,5 +1,5 @@
 use crate::{
-    Context, JsResult, JsValue,
+    Context, JsExpect, JsResult, JsValue,
     builtins::Array,
     string::StaticJsStrings,
     vm::opcode::{Operation, RegisterOperand},
@@ -42,13 +42,13 @@ impl PushValueToArray {
     pub(crate) fn operation(
         (value, array): (RegisterOperand, RegisterOperand),
         context: &mut Context,
-    ) {
+    ) -> JsResult<()> {
         let value = context.vm.get_register(value.into()).clone();
         let o = context
             .vm
             .get_register(array.into())
             .as_object()
-            .expect("should be an object");
+            .js_expect("should be an object")?;
 
         // Fast path: push directly to dense indexed storage.
         {
@@ -58,16 +58,17 @@ impl PushValueToArray {
                 && o_mut.properties_mut().indexed_properties.push_dense(&value)
             {
                 o_mut.properties_mut().storage[0] = JsValue::new(len + 1);
-                return;
+                return Ok(());
             }
         }
 
         // Slow path: fall through to the generic property machinery.
         let len = o
             .length_of_array_like(context)
-            .expect("should have 'length' property");
+            .js_expect("should have 'length' property")?;
         o.create_data_property_or_throw(len, value, context)
-            .expect("should be able to create new data property");
+            .js_expect("should be able to create new data property")?;
+        Ok(())
     }
 }
 
@@ -88,10 +89,10 @@ impl PushElisionToArray {
     #[inline(always)]
     pub(crate) fn operation(array: RegisterOperand, context: &mut Context) -> JsResult<()> {
         let array = context.vm.get_register(array.into()).clone();
-        let o = array.as_object().expect("should always be an object");
+        let o = array.as_object().js_expect("should always be an object")?;
         let len = o
             .length_of_array_like(context)
-            .expect("arrays should always have a 'length' property");
+            .js_expect("arrays should always have a 'length' property")?;
         o.set(StaticJsStrings::LENGTH, len + 1, true, context)?;
         o.borrow_mut()
             .properties_mut()
@@ -123,7 +124,7 @@ impl PushIteratorToArray {
             .frame_mut()
             .iterators
             .pop()
-            .expect("iterator stack should have at least an iterator");
+            .js_expect("iterator stack should have at least an iterator")?;
         while let Some(next) = iterator.step_value(context)? {
             Array::push(&array, &[next], context)?;
         }