equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent e42a036a5533ea6a60ebc22fd2a150c384d42fda |
2 # Parent f9f5af4c88f2f3172a4f30d7e42bd2131bf24146 |
3 This fixes a broken build for gcc < 9 on ppc64le. |
3 This fixes a broken build for gcc < 9 on ppc64le. |
4 This patch can be removed for newer gcc-versions. |
4 This patch can be removed for newer gcc-versions. |
5 |
5 |
6 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp |
6 diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp |
7 --- a/js/xpconnect/src/XPCWrappedNative.cpp |
7 --- a/js/xpconnect/src/XPCWrappedNative.cpp |
8 +++ b/js/xpconnect/src/XPCWrappedNative.cpp |
8 +++ b/js/xpconnect/src/XPCWrappedNative.cpp |
9 @@ -1080,17 +1080,21 @@ class MOZ_STACK_CLASS CallMethodHelper f |
9 @@ -1072,17 +1072,21 @@ class MOZ_STACK_CLASS CallMethodHelper f |
10 uint32_t* result); |
10 uint32_t* result); |
11 |
11 |
12 MOZ_ALWAYS_INLINE bool GetInterfaceTypeFromParam(const nsXPTType& type, |
12 MOZ_ALWAYS_INLINE bool GetInterfaceTypeFromParam(const nsXPTType& type, |
13 nsID* result) const; |
13 nsID* result) const; |
14 |
14 |
27 nsXPTCVariant* GetDispatchParam(uint8_t paramIndex) { |
27 nsXPTCVariant* GetDispatchParam(uint8_t paramIndex) { |
28 if (paramIndex >= mJSContextIndex) { |
28 if (paramIndex >= mJSContextIndex) { |
29 paramIndex += 1; |
29 paramIndex += 1; |
30 } |
30 } |
31 if (paramIndex >= mOptArgcIndex) { |
31 if (paramIndex >= mOptArgcIndex) { |
32 @@ -1127,17 +1131,21 @@ class MOZ_STACK_CLASS CallMethodHelper f |
32 @@ -1119,17 +1123,21 @@ class MOZ_STACK_CLASS CallMethodHelper f |
33 |
33 |
34 { |
34 { |
35 // Success checked later. |
35 // Success checked later. |
36 mIFaceInfo->GetMethodInfo(mVTableIndex, &mMethodInfo); |
36 mIFaceInfo->GetMethodInfo(mVTableIndex, &mMethodInfo); |
37 } |
37 } |