--- StringType.cpp
+++ StringType.cpp
@@ -1513,10 +1513,12 @@
Rooted<JSLinearString*> linearString(cx, s->ensureLinear(cx));
if (!linearString) {
return false;
}
+ linearString->setDependedOn();
+
MOZ_ASSERT(state_ == Uninitialized);
// Inline and nursery-allocated chars may move during a GC, so copy them
// out into a temporary malloced buffer. Note that we cannot update the
// string itself with a malloced buffer, because there may be dependent
@@ -1544,10 +1546,12 @@
Rooted<JSLinearString*> linearString(cx, s->ensureLinear(cx));
if (!linearString) {
return false;
}
+ linearString->setDependedOn();
+
MOZ_ASSERT(state_ == Uninitialized);
if (linearString->hasLatin1Chars()) {
return copyAndInflateLatin1Chars(cx, linearString);
}
Raw error output:
Problem while applying patch in revision 211241:
hg error in cmd: hg import --no-commit -s 95 /tmp/tmptpe_iyja: applying /tmp/tmptpe_iyja
patching file js/src/vm/StringType.cpp
Hunk #1 FAILED at 1512
Hunk #2 FAILED at 1543
2 out of 2 hunks FAILED -- saving rejects to file js/src/vm/StringType.cpp.rej
abort: patch failed to apply