Bug 1087828 - Make sure type objects have been swept when modifying their flags, r=billm.
authorBrian Hackett <bhackett1024@gmail.com>
Fri, 24 Oct 2014 06:05:22 -0700
changeset 212242 e94b66dca22c51c7fe0d8df1e0b92b651eca28c5
parent 212241 91ac49c348b1e9a9e5811723099bd34907b44edd
child 212243 f895938013ff649667178bc21cde5037ecfae06a
push id27702
push userkwierso@gmail.com
push dateFri, 24 Oct 2014 22:05:50 +0000
treeherdermozilla-central@c70f62375f7d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbillm
bugs1087828
milestone36.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
Bug 1087828 - Make sure type objects have been swept when modifying their flags, r=billm.
js/src/jsinfer.h
--- a/js/src/jsinfer.h
+++ b/js/src/jsinfer.h
@@ -1101,22 +1101,22 @@ struct TypeObject : public gc::TenuredCe
   public:
 
     TypeObjectFlags flags() {
         maybeSweep(nullptr);
         return flags_;
     }
 
     void addFlags(TypeObjectFlags flags) {
-        MOZ_ASSERT(!needsSweep());
+        maybeSweep(nullptr);
         flags_ |= flags;
     }
 
     void clearFlags(TypeObjectFlags flags) {
-        MOZ_ASSERT(!needsSweep());
+        maybeSweep(nullptr);
         flags_ &= ~flags;
     }
 
     TypeNewScript *newScript() {
         maybeSweep(nullptr);
         return newScript_;
     }