Windows-specific warning patrol. No bug, r=themaid
authorJeff Walden <jwalden@mit.edu>
Sat, 25 Feb 2012 01:59:12 -0800
changeset 87725 e999dda657ba03720ca5261a3a0fdf2af29fa7d2
parent 87724 b86f8295746190d92286ea0909bec768f5d307f2
child 87726 3160e7df9b4db77df9d631faffe68e5201311de4
push id22143
push userphilringnalda@gmail.com
push dateSun, 26 Feb 2012 23:12:35 +0000
treeherdermozilla-central@b98fc24ac54b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersthemaid
milestone13.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Windows-specific warning patrol. No bug, r=themaid
js/src/jscntxt.cpp
js/src/jsiter.cpp
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -965,17 +965,17 @@ JSContext::JSContext(JSRuntime *rt)
     reportGranularity(JS_DEFAULT_JITREPORT_GRANULARITY),
     localeCallbacks(NULL),
     resolvingList(NULL),
     generatingError(false),
     compartment(NULL),
     stack(thisDuringConstruction()),  /* depends on cx->thread_ */
     parseMapPool_(NULL),
     globalObject(NULL),
-    sharpObjectMap(this),
+    sharpObjectMap(thisDuringConstruction()),
     argumentFormatMap(NULL),
     lastMessage(NULL),
     errorReporter(NULL),
     operationCallback(NULL),
     data(NULL),
     data2(NULL),
 #ifdef JS_THREADSAFE
     outstandingRequests(0),
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -1026,17 +1026,17 @@ SuppressDeletedPropertyHelper(JSContext 
                         for (HeapPtr<JSFlatString> *p = idp; p + 1 != props_end; p++)
                             *p = *(p + 1);
                         ni->props_end = ni->end() - 1;
 
                         /*
                          * Invoke the write barrier on this element, since it's
                          * no longer going to be marked.
                          */
-                        ni->props_end->HeapPtr<JSFlatString>::~HeapPtr<JSFlatString>();
+                        ni->props_end->HeapPtr<JSFlatString>::~HeapPtr();
                     }
 
                     /* Don't reuse modified native iterators. */
                     ni->flags |= JSITER_UNREUSABLE;
 
                     if (predicate.matchesAtMostOne())
                         break;
                 }