author | Wolfgang Rosenauer <wr@rosenauer.org> |
Fri, 12 Jun 2020 23:02:01 +0200 | |
changeset 1131 | 4a5aa8293178 |
parent 1123 | 7fa561e5d7c7 |
child 1152 | 4cfe46c9a944 |
permissions | -rw-r--r-- |
1109
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
1123 | 2 |
# Parent e42a036a5533ea6a60ebc22fd2a150c384d42fda |
1109
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
This fixes a broken build for gcc < 9 on ppc64le. |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
This patch can be removed for newer gcc-versions. |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
|
1123 | 6 |
diff --git a/js/xpconnect/src/XPCWrappedNative.cpp b/js/xpconnect/src/XPCWrappedNative.cpp |
7 |
--- a/js/xpconnect/src/XPCWrappedNative.cpp |
|
8 |
+++ b/js/xpconnect/src/XPCWrappedNative.cpp |
|
9 |
@@ -1080,17 +1080,21 @@ class MOZ_STACK_CLASS CallMethodHelper f |
|
10 |
uint32_t* result); |
|
11 |
||
12 |
MOZ_ALWAYS_INLINE bool GetInterfaceTypeFromParam(const nsXPTType& type, |
|
13 |
nsID* result) const; |
|
14 |
||
1109
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
MOZ_ALWAYS_INLINE bool GetOutParamSource(uint8_t paramIndex, |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
MutableHandleValue srcp) const; |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
|
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
- MOZ_ALWAYS_INLINE bool GatherAndConvertResults(); |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+#if !(__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN) |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+// Work around a compiler bug on ppc64le (bug 1512162). |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+ MOZ_ALWAYS_INLINE |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
+#endif |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
+ bool GatherAndConvertResults(); |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
|
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
MOZ_ALWAYS_INLINE bool QueryInterfaceFastPath(); |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
|
1123 | 27 |
nsXPTCVariant* GetDispatchParam(uint8_t paramIndex) { |
28 |
if (paramIndex >= mJSContextIndex) { |
|
29 |
paramIndex += 1; |
|
30 |
} |
|
31 |
if (paramIndex >= mOptArgcIndex) { |
|
32 |
@@ -1127,17 +1131,21 @@ class MOZ_STACK_CLASS CallMethodHelper f |
|
33 |
||
34 |
{ |
|
35 |
// Success checked later. |
|
36 |
mIFaceInfo->GetMethodInfo(mVTableIndex, &mMethodInfo); |
|
37 |
} |
|
1109
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
|
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
~CallMethodHelper(); |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
|
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
- MOZ_ALWAYS_INLINE bool Call(); |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
+#if !(__GNUC__ && __linux__ && __PPC64__ && _LITTLE_ENDIAN) |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+// Work around a compiler bug on ppc64le (bug 1512162). |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
+ MOZ_ALWAYS_INLINE |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
+#endif |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
+ bool Call(); |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
|
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
// Trace implementation so we can put our CallMethodHelper in a Rooted<T>. |
972f68ac6b1a
Firefox 69.0 as released to Factory/Tumbleweed
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
void trace(JSTracer* aTrc); |
1123 | 50 |
}; |
51 |
||
52 |
// static |
|
53 |
bool XPCWrappedNative::CallMethod(XPCCallContext& ccx, |
|
54 |
CallMode mode /*= CALL_METHOD */) { |