Merging upstream version 126.0.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/js/public/experimental/JitInfo.h b/js/public/experimental/JitInfo.h
index 1b070021bd..896b5fef68 100644
--- a/js/public/experimental/JitInfo.h
+++ b/js/public/experimental/JitInfo.h
@@ -8,6 +8,7 @@
 #define js_experimental_JitInfo_h
 
 #include "mozilla/Assertions.h"  // MOZ_ASSERT
+#include "mozilla/Attributes.h"  // MOZ_NON_PARAM
 
 #include <stddef.h>  // size_t
 #include <stdint.h>  // uint16_t, uint32_t
@@ -21,6 +22,7 @@ namespace js {
 namespace jit {
 
 enum class InlinableNative : uint16_t;
+enum class TrampolineNative : uint16_t;
 
 }  // namespace jit
 
@@ -72,7 +74,7 @@ struct JSJitMethodCallArgsTraits;
  * A class, expected to be passed by reference, which represents the CallArgs
  * for a JSJitMethodOp.
  */
-class JSJitMethodCallArgs
+class MOZ_NON_PARAM JSJitMethodCallArgs
     : protected JS::detail::CallArgsBase<JS::detail::NoUsedRval> {
  private:
   using Base = JS::detail::CallArgsBase<JS::detail::NoUsedRval>;
@@ -137,6 +139,7 @@ class JSJitInfo {
     Method,
     StaticMethod,
     InlinableNative,
+    TrampolineNative,
     IgnoresReturnValueNative,
     // Must be last
     OpTypeCount
@@ -226,6 +229,7 @@ class JSJitInfo {
   union {
     uint16_t protoID;
     js::jit::InlinableNative inlinableNative;
+    js::jit::TrampolineNative trampolineNative;
   };
 
   union {