Contents of /trunk/spidermonkey/patches/spidermonkey-1.8.5-gcc6.patch
Parent Directory | Revision Log
Revision 2963 -
(show annotations)
(download)
Mon Aug 7 11:05:14 2017 UTC (7 years, 1 month ago) by niro
File size: 5828 byte(s)
Mon Aug 7 11:05:14 2017 UTC (7 years, 1 month ago) by niro
File size: 5828 byte(s)
-added gcc6 patch
1 | diff -upr a/js/src/jsapi.cpp b/js/src/jsapi.cpp |
2 | --- a/js/src/jsapi.cpp 2011-03-31 14:08:36.000000000 -0500 |
3 | +++ b/js/src/jsapi.cpp 2016-02-29 18:10:49.302307353 -0600 |
4 | @@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob |
5 | AutoIdVector props(cx); |
6 | JSIdArray *ida; |
7 | if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida)) |
8 | - return false; |
9 | + return NULL; |
10 | for (size_t n = 0; n < size_t(ida->length); ++n) |
11 | JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]); |
12 | return ida; |
13 | diff -upr a/js/src/jsfun.cpp b/js/src/jsfun.cpp |
14 | --- a/js/src/jsfun.cpp 2011-03-31 14:08:36.000000000 -0500 |
15 | +++ b/js/src/jsfun.cpp 2016-02-29 18:21:45.249674890 -0600 |
16 | @@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje |
17 | |
18 | JSString *str = JS_DecompileFunction(cx, fun, indent); |
19 | if (!str) |
20 | - return false; |
21 | + return NULL; |
22 | |
23 | if (!indent) |
24 | cx->compartment->toSourceCache.put(fun, str); |
25 | @@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon |
26 | const Shape *shape = funobj->nativeLookup(id); |
27 | if (!shape) { |
28 | if (!ResolveInterpretedFunctionPrototype(cx, funobj)) |
29 | - return false; |
30 | + return NULL; |
31 | shape = funobj->nativeLookup(id); |
32 | } |
33 | JS_ASSERT(!shape->configurable()); |
34 | diff -upr a/js/src/jsiter.cpp b/js/src/jsiter.cpp |
35 | --- a/js/src/jsiter.cpp 2011-03-31 14:08:36.000000000 -0500 |
36 | +++ b/js/src/jsiter.cpp 2016-02-29 18:24:22.494659919 -0600 |
37 | @@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f |
38 | */ |
39 | JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0); |
40 | if (!obj) |
41 | - return false; |
42 | + return NULL; |
43 | obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false); |
44 | obj->setMap(cx->compartment->emptyEnumeratorShape); |
45 | return obj; |
46 | diff -upr a/js/src/jsparse.cpp b/js/src/jsparse.cpp |
47 | --- a/js/src/jsparse.cpp 2011-03-31 14:08:36.000000000 -0500 |
48 | +++ b/js/src/jsparse.cpp 2016-02-29 18:29:03.997437475 -0600 |
49 | @@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun |
50 | if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) { |
51 | JS_ASSERT(pn->pn_cookie.isFree()); |
52 | if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom)) |
53 | - return false; |
54 | + return NULL; |
55 | } |
56 | |
57 | pn->pn_blockid = outertc->blockid(); |
58 | diff -upr a/js/src/jsstr.cpp b/js/src/jsstr.cpp |
59 | --- a/js/src/jsstr.cpp 2011-03-31 14:08:36.000000000 -0500 |
60 | +++ b/js/src/jsstr.cpp 2016-02-29 19:01:45.857779836 -0600 |
61 | @@ -1734,7 +1734,7 @@ class RegExpGuard |
62 | if (flat) { |
63 | patstr = flattenPattern(cx, fm.patstr); |
64 | if (!patstr) |
65 | - return false; |
66 | + return NULL; |
67 | } else { |
68 | patstr = fm.patstr; |
69 | } |
70 | @@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje |
71 | UndefinedValue(), NULL, NULL, |
72 | JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0, |
73 | NULL)) { |
74 | - return JS_FALSE; |
75 | + return NULL; |
76 | } |
77 | |
78 | return proto; |
79 | diff -upr a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp |
80 | --- a/js/src/jstypedarray.cpp 2011-03-31 14:08:36.000000000 -0500 |
81 | +++ b/js/src/jstypedarray.cpp 2016-02-29 19:08:53.541136191 -0600 |
82 | @@ -1334,7 +1334,7 @@ class TypedArrayTemplate |
83 | if (size != 0 && count >= INT32_MAX / size) { |
84 | JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, |
85 | JSMSG_NEED_DIET, "size and count"); |
86 | - return false; |
87 | + return NULL; |
88 | } |
89 | |
90 | int32 bytelen = size * count; |
91 | @@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint |
92 | |
93 | default: |
94 | JS_NOT_REACHED("shouldn't have gotten here"); |
95 | - return false; |
96 | + return NULL; |
97 | } |
98 | } |
99 | |
100 | diff -upr a/js/src/jsxml.cpp b/js/src/jsxml.cpp |
101 | --- a/js/src/jsxml.cpp 2011-03-31 14:08:36.000000000 -0500 |
102 | +++ b/js/src/jsxml.cpp 2016-02-29 19:17:10.363279731 -0600 |
103 | @@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS |
104 | |
105 | obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass); |
106 | if (!obj) |
107 | - return JS_FALSE; |
108 | + return NULL; |
109 | JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal())); |
110 | JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal())); |
111 | JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared())); |
112 | @@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb |
113 | size_t length = str->length(); |
114 | jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar)); |
115 | if (!chars) |
116 | - return JS_FALSE; |
117 | + return NULL; |
118 | *chars = '@'; |
119 | const jschar *strChars = str->getChars(cx); |
120 | if (!strChars) { |
121 | diff -upr a/js/src/methodjit/InvokeHelpers.cpp b/js/src/methodjit/InvokeHelpers.cpp |
122 | --- a/js/src/methodjit/InvokeHelpers.cpp 2011-03-31 14:08:36.000000000 -0500 |
123 | +++ b/js/src/methodjit/InvokeHelpers.cpp 2016-02-29 20:34:14.496983346 -0600 |
124 | @@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx) |
125 | { |
126 | JSStackFrame *fp = cx->fp(); |
127 | if (fp->hasImacropc()) |
128 | - return false; |
129 | + return NULL; |
130 | |
131 | JSScript *script = fp->script(); |
132 | return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc); |
133 | diff -upr a/js/src/nanojit/NativeX64.cpp b/js/src/nanojit/NativeX64.cpp |
134 | --- a/js/src/nanojit/NativeX64.cpp 2011-03-31 14:08:36.000000000 -0500 |
135 | +++ b/js/src/nanojit/NativeX64.cpp 2016-02-29 20:19:56.487934808 -0600 |
136 | @@ -1899,7 +1899,7 @@ namespace nanojit |
137 | } |
138 | } |
139 | |
140 | - static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0}; |
141 | + static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {int64_t(0x8000000000000000LL),0}; |
142 | |
143 | void Assembler::asm_fneg(LIns *ins) { |
144 | Register rr, ra; |