Bug 1146597 - Avoid unnecessary calls to maybeSweep under hasUnanalyzedPreliminaryObjects, r=jandem.
authorBrian Hackett <bhackett1024@gmail.com>
Wed, 13 May 2015 07:30:05 -0600
changeset 243723 ab0de7cdab7f06e8b61107fc49a5201f930d2d7e
parent 243722 89c05305c708ec303dd70a38fd01e41d6e1e089e
child 243724 cec3e691751ff3620b9a1b2917084a3ccbb7cc3c
push id28753
push userkwierso@gmail.com
push dateThu, 14 May 2015 22:33:43 +0000
treeherdermozilla-central@07e2e15703cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjandem
bugs1146597
milestone41.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 1146597 - Avoid unnecessary calls to maybeSweep under hasUnanalyzedPreliminaryObjects, r=jandem.
js/src/vm/ObjectGroup.h
--- a/js/src/vm/ObjectGroup.h
+++ b/js/src/vm/ObjectGroup.h
@@ -325,17 +325,18 @@ class ObjectGroup : public gc::TenuredCe
     }
 
     void detachPreliminaryObjects() {
         MOZ_ASSERT(maybePreliminaryObjects());
         setAddendum(Addendum_None, nullptr);
     }
 
     bool hasUnanalyzedPreliminaryObjects() {
-        return (newScript() && !newScript()->analyzed()) || maybePreliminaryObjects();
+        return (newScriptDontCheckGeneration() && !newScriptDontCheckGeneration()->analyzed()) ||
+               maybePreliminaryObjectsDontCheckGeneration();
     }
 
     UnboxedLayout* maybeUnboxedLayout() {
         maybeSweep(nullptr);
         return maybeUnboxedLayoutDontCheckGeneration();
     }
 
     UnboxedLayout& unboxedLayoutDontCheckGeneration() const {