corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge TM -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-03-22 18:07:31 -07:00
parent 81607e548b f86e9077c6
commit 3d67384c02
638 changed files with 14269 additions and 6389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsarray.cpp
View File

@@ -115,6 +115,7 @@
#include "jsscopeinlines.h"
#include "jscntxtinlines.h"
#include "jsinferinlines.h"
#include "jsstrinlines.h"
using namespace js;
using namespace js::gc;
@@ -1284,7 +1285,7 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
genBefore = cx->busyArrays.generation();
} else {
/* Cycle, so return empty string. */
rval->setString(ATOM_TO_STRING(cx->runtime->atomState.emptyAtom));
rval->setString(cx->runtime->atomState.emptyAtom);
return true;
}
@@ -3711,7 +3712,7 @@ js_CloneDensePrimitiveArray(JSContext *cx, JSObject *obj, JSObject **clone)
if (val.isString()) {
// Strings must be made immutable before being copied to a clone.
if (!js_MakeStringImmutable(cx, val.toString()))
if (!val.toString()->ensureFixed(cx))
return JS_FALSE;
} else if (val.isObject()) {
/*