Merge from mozilla-central.

2012-08-10 14:50:20 -07:00
parent 054f9a49ce f5fb6b0762
commit e3ccac8193
240 changed files with 5519 additions and 3277 deletions
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -300,6 +300,7 @@ Snapshot(JSContext *cx, RawObject obj_, unsigned flags, AutoIdVector *props)
    AutoIdVector tmp(cx);
    if (!tmp.resize(n))
        return false;
+    PodCopy(tmp.begin(), ids, n);

    if (!MergeSort(ids, n, tmp.begin(), SortComparatorIds(cx)))
        return false;