View | Details | Raw Unified | Return to bug 256007
Collapse All | Expand All

(-)b/lang/spidermonkey185/files/patch-c++11 (+44 lines)
Lines 123-128 jsxml.cpp:434:20: error: cannot initialize return object of type 'JSString *' wi Link Here
123
     JS_ASSERT(!shape->configurable());
123
     JS_ASSERT(!shape->configurable());
124
--- jsiter.cpp.orig	2011-03-31 19:08:36 UTC
124
--- jsiter.cpp.orig	2011-03-31 19:08:36 UTC
125
+++ jsiter.cpp
125
+++ jsiter.cpp
126
@@ -267,7 +267,7 @@ Snapshot(JSContext *cx, JSObject *obj, uintN flags, Au
127
      */
128
     IdSet ht(cx);
129
     if (!ht.init(32))
130
-        return NULL;
131
+        return false;
132
 
133
     JSObject *pobj = obj;
134
     do {
126
@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN flags)
135
@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN flags)
127
          */
136
          */
128
         JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
137
         JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
Lines 134-139 jsxml.cpp:434:20: error: cannot initialize return object of type 'JSString *' wi Link Here
134
         return obj;
143
         return obj;
135
--- jsparse.cpp.orig	2011-03-31 19:08:36 UTC
144
--- jsparse.cpp.orig	2011-03-31 19:08:36 UTC
136
+++ jsparse.cpp
145
+++ jsparse.cpp
146
@@ -1821,14 +1821,14 @@ Compiler::compileFunctionBody(JSContext *cx, JSFunctio
147
 
148
     JSCodeGenerator funcg(&parser, &codePool, &notePool, tokenStream.getLineno());
149
     if (!funcg.init())
150
-        return NULL;
151
+        return false;
152
 
153
     funcg.flags |= TCF_IN_FUNCTION;
154
     funcg.setFunction(fun);
155
     funcg.bindings.transfer(cx, bindings);
156
     fun->setArgCount(funcg.bindings.countArgs());
157
     if (!GenerateBlockId(&funcg, funcg.bodyid))
158
-        return NULL;
159
+        return false;
160
 
161
     /* FIXME: make Function format the source for a function definition. */
162
     tokenStream.mungeCurrentToken(TOK_NAME);
137
@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type
163
@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, FunctionType type
138
     if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
164
     if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
139
         JS_ASSERT(pn->pn_cookie.isFree());
165
         JS_ASSERT(pn->pn_cookie.isFree());
Lines 143-148 jsxml.cpp:434:20: error: cannot initialize return object of type 'JSString *' wi Link Here
143
     }
169
     }
144
 
170
 
145
     pn->pn_blockid = outertc->blockid();
171
     pn->pn_blockid = outertc->blockid();
172
@@ -5058,7 +5058,7 @@ RebindLets(JSParseNode *pn, JSTreeContext *tc)
173
                 if (!ale) {
174
                     ale = MakePlaceholder(pn, tc);
175
                     if (!ale)
176
-                        return NULL;
177
+                        return false;
178
                 }
179
                 LinkUseToDef(pn, ALE_DEFN(ale), tc);
180
             }
146
--- jsstr.cpp.orig	2011-03-31 19:08:36 UTC
181
--- jsstr.cpp.orig	2011-03-31 19:08:36 UTC
147
+++ jsstr.cpp
182
+++ jsstr.cpp
148
@@ -1734,7 +1734,7 @@ class RegExpGuard
183
@@ -1734,7 +1734,7 @@ class RegExpGuard
Lines 154-159 jsxml.cpp:434:20: error: cannot initialize return object of type 'JSString *' wi Link Here
154
         } else {
189
         } else {
155
             patstr = fm.patstr;
190
             patstr = fm.patstr;
156
         }
191
         }
192
@@ -2276,7 +2276,7 @@ BuildDollarReplacement(JSContext *cx, JSString *textst
193
 {
194
     JSLinearString *textstr = textstrArg->ensureLinear(cx);
195
     if (!textstr)
196
-        return NULL;
197
+        return false;
198
 
199
     JS_ASSERT(repstr->chars() <= firstDollar && firstDollar < repstr->chars() + repstr->length());
200
     size_t matchStart = fm.match();
157
@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObject *obj)
201
@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObject *obj)
158
                                  UndefinedValue(), NULL, NULL,
202
                                  UndefinedValue(), NULL, NULL,
159
                                  JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
203
                                  JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
(-)b/lang/spidermonkey185/files/patch-methodjit_MethodJIT.cpp (+38 lines)
Added Link Here
1
--- methodjit/MethodJIT.cpp.orig	2011-03-31 19:08:36 UTC
2
+++ methodjit/MethodJIT.cpp
3
@@ -189,7 +189,7 @@ JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
4
 JS_STATIC_ASSERT(JSVAL_TAG_MASK == 0xFFFF800000000000LL);
5
 JS_STATIC_ASSERT(JSVAL_PAYLOAD_MASK == 0x00007FFFFFFFFFFFLL);
6
 
7
-asm volatile (
8
+asm (
9
 ".text\n"
10
 ".globl " SYMBOL_STRING(JaegerTrampoline) "\n"
11
 SYMBOL_STRING(JaegerTrampoline) ":"       "\n"
12
@@ -236,7 +236,7 @@ SYMBOL_STRING(JaegerTrampoline) ":"       "\n"
13
     "jmp *0(%rsp)"                      "\n"
14
 );
15
 
16
-asm volatile (
17
+asm (
18
 ".text\n"
19
 ".globl " SYMBOL_STRING(JaegerTrampolineReturn) "\n"
20
 SYMBOL_STRING(JaegerTrampolineReturn) ":"       "\n"
21
@@ -256,7 +256,7 @@ SYMBOL_STRING(JaegerTrampolineReturn) ":"       "\n"
22
     "ret"                                "\n"
23
 );
24
 
25
-asm volatile (
26
+asm (
27
 ".text\n"
28
 ".globl " SYMBOL_STRING(JaegerThrowpoline)  "\n"
29
 SYMBOL_STRING(JaegerThrowpoline) ":"        "\n"
30
@@ -281,7 +281,7 @@ SYMBOL_STRING(JaegerThrowpoline) ":"        "\n"
31
 
32
 JS_STATIC_ASSERT(offsetof(VMFrame, regs.fp) == 0x38);
33
 
34
-asm volatile (
35
+asm (
36
 ".text\n"
37
 ".globl " SYMBOL_STRING(InjectJaegerReturn)   "\n"
38
 SYMBOL_STRING(InjectJaegerReturn) ":"         "\n"

Return to bug 256007