Bug 1875894: Update PortableBaselineInterpreter to handle new opcodes. r=iain

Differential Revision: https://phabricator.services.mozilla.com/D199336

Author: anba

js/src/vm/PortableBaselineInterpret.cpp

@@ -4421,17 +4421,16 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
     }
 
     CASE(AsyncResolve) {
-      // valueOrReason, gen => promise
-      auto resolveKind = AsyncFunctionResolveKind(GET_UINT8(pc));
+      // value, gen => promise
       JSObject* promise;
       {
         ReservedRooted<JSObject*> obj0(&state.obj0,
                                        &POP().asValue().toObject());  // gen
         ReservedRooted<Value> value0(&state.value0,
-                                     POP().asValue());  // valueOrReason
+                                     POP().asValue());  // value
         PUSH_EXIT_FRAME();
         promise = AsyncFunctionResolve(
-            cx, obj0.as<AsyncFunctionGeneratorObject>(), value0, resolveKind);
+            cx, obj0.as<AsyncFunctionGeneratorObject>(), value0);
         if (!promise) {
           goto error;
         }
@@ -4440,6 +4439,27 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
       END_OP(AsyncResolve);
     }
 
+    CASE(AsyncReject) {
+      // reason, gen => promise
+      JSObject* promise;
+      {
+        ReservedRooted<JSObject*> obj0(&state.obj0,
+                                       &POP().asValue().toObject());  // gen
+        ReservedRooted<Value> value0(&state.value0,
+                                     POP().asValue());  // stack
+        ReservedRooted<Value> value1(&state.value1,
+                                     POP().asValue());  // reason
+        PUSH_EXIT_FRAME();
+        promise = AsyncFunctionReject(
+            cx, obj0.as<AsyncFunctionGeneratorObject>(), value1, value0);
+        if (!promise) {
+          goto error;
+        }
+      }
+      PUSH(StackVal(ObjectValue(*promise)));
+      END_OP(AsyncReject);
+    }
+
     CASE(CanSkipAwait) {
       // value => value, can_skip
       bool result = false;
@@ -4724,6 +4744,17 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
       END_OP(Throw);
     }
 
+    CASE(ThrowWithStack) {
+      {
+        ReservedRooted<Value> value0(&state.value0, POP().asValue());
+        ReservedRooted<Value> value1(&state.value1, POP().asValue());
+        PUSH_EXIT_FRAME();
+        MOZ_ALWAYS_FALSE(ThrowWithStackOperation(cx, value1, value0));
+        goto error;
+      }
+      END_OP(ThrowWithStack);
+    }
+
     CASE(ThrowMsg) {
       {
         PUSH_EXIT_FRAME();
@@ -4760,6 +4791,25 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
       END_OP(Exception);
     }
 
+    CASE(ExceptionAndStack) {
+      {
+        ReservedRooted<Value> value0(&state.value0);
+        {
+          PUSH_EXIT_FRAME();
+          if (!cx.getCx()->getPendingExceptionStack(&value0)) {
+            goto error;
+          }
+          if (!GetAndClearException(cx, &state.res)) {
+            goto error;
+          }
+        }
+        PUSH(StackVal(state.res));
+        PUSH(StackVal(value0));
+        state.res.setUndefined();
+      }
+      END_OP(ExceptionAndStack);
+    }
+
     CASE(Finally) {
 #ifndef __wasi__
       if (frameMgr.cxForLocalUseOnly()->hasAnyPendingInterrupt()) {
@@ -5256,6 +5306,7 @@ PBIResult PortableBaselineInterpret(JSContext* cx_, State& state, Stack& stack,
         sp = reinterpret_cast<StackVal*>(rfe.stackPointer);
         TRACE_PRINTF(" -> finally to pc %p\n", pc);
         PUSH(StackVal(rfe.exception));
+        PUSH(StackVal(rfe.exceptionStack));
         PUSH(StackVal(BooleanValue(true)));
         stack.unwindingSP = sp;
         goto unwind;