From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 js/src/jit/CodeGenerator.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'js/src/jit/CodeGenerator.h')

diff --git a/js/src/jit/CodeGenerator.h b/js/src/jit/CodeGenerator.h
index 282771a79e..c883569193 100644
--- a/js/src/jit/CodeGenerator.h
+++ b/js/src/jit/CodeGenerator.h
@@ -108,6 +108,11 @@ class CodeGenerator final : public CodeGeneratorSpecific {
   inline OutOfLineCode* oolCallVM(LInstruction* ins, const ArgSeq& args,
                                   const StoreOutputTo& out);
 
+  template <typename LCallIns>
+  void emitCallNative(LCallIns* call, JSNative native, Register argContextReg,
+                      Register argUintNReg, Register argVpReg, Register tempReg,
+                      uint32_t unusedStack);
+
   template <typename LCallIns>
   void emitCallNative(LCallIns* call, JSNative native);
 
@@ -204,6 +209,11 @@ class CodeGenerator final : public CodeGeneratorSpecific {
                              wasm::BytecodeOffset bytecodeOffset);
   void visitOutOfLineWasmNewArray(OutOfLineWasmNewArray* ool);
 
+#ifdef ENABLE_WASM_JSPI
+  void callWasmUpdateSuspenderState(wasm::UpdateSuspenderStateAction kind,
+                                    Register suspender);
+#endif
+
  private:
   void emitPostWriteBarrier(const LAllocation* obj);
   void emitPostWriteBarrier(Register objreg);
@@ -248,7 +258,7 @@ class CodeGenerator final : public CodeGeneratorSpecific {
   template <typename T>
   void emitApplyNative(T* apply);
   template <typename T>
-  void emitCallInvokeNativeFunction(T* apply);
+  void emitAlignStackForApplyNative(T* apply, Register argc);
   template <typename T>
   void emitPushNativeArguments(T* apply);
   template <typename T>
-- 
cgit v1.2.3