Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 34 insertions, 1 deletions

diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp
index ed3f63c88c..3ec85a72c2 100644
--- a/js/src/jit/VMFunctions.cpp
+++ b/js/src/jit/VMFunctions.cpp
@@ -545,6 +545,39 @@ bool InvokeFunction(JSContext* cx, HandleObject obj, bool constructing,
   return Call(cx, fval, thisv, args, rval);
 }
 
+bool InvokeNativeFunction(JSContext* cx, bool constructing,
+                          bool ignoresReturnValue, uint32_t argc, Value* argv,
+                          MutableHandleValue rval) {
+  // Ensure argv array is rooted - we may GC in here.
+  size_t numValues = argc + 2 + constructing;
+  RootedExternalValueArray argvRoot(cx, numValues, argv);
+
+  // Data in the argument vector is arranged for a JIT -> C++ call.
+  CallArgs callArgs = CallArgsFromSp(argc + constructing, argv + numValues,
+                                     constructing, ignoresReturnValue);
+
+  // This function is only called when the callee is a native function.
+  MOZ_ASSERT(callArgs.callee().as<JSFunction>().isNativeWithoutJitEntry());
+
+  if (constructing) {
+    MOZ_ASSERT(callArgs.thisv().isMagic(JS_IS_CONSTRUCTING));
+
+    if (!ConstructFromStack(cx, callArgs)) {
+      return false;
+    }
+
+    MOZ_ASSERT(callArgs.rval().isObject(),
+               "native constructors don't return primitives");
+  } else {
+    if (!CallFromStack(cx, callArgs)) {
+      return false;
+    }
+  }
+
+  rval.set(callArgs.rval());
+  return true;
+}
+
 void* GetContextSensitiveInterpreterStub() {
   return TlsContext.get()->runtime()->jitRuntime()->interpreterStub().value;
 }
@@ -1111,7 +1144,7 @@ bool NormalSuspend(JSContext* cx, HandleObject obj, BaselineFrame* frame,
 
 bool FinalSuspend(JSContext* cx, HandleObject obj, const jsbytecode* pc) {
   MOZ_ASSERT(JSOp(*pc) == JSOp::FinalYieldRval);
-  AbstractGeneratorObject::finalSuspend(obj);
+  AbstractGeneratorObject::finalSuspend(cx, obj);
   return true;
 }