autoland: changeset 369255:fbe95017106a4a5ce6b2cca64c535b4885aa1938

author	Jon Coppeard <jcoppeard@mozilla.com>
	Mon, 17 Jul 2017 11:01:19 +0100
changeset 369255	fbe95017106a4a5ce6b2cca64c535b4885aa1938
parent 369254	d0c73b22611c17a86a26c934077f542df3b375cf
child 369256	8df92cb52eb45d99cb3239150879de98bf4c4015
push id	46631
push user	kwierso@gmail.com
push date	Tue, 18 Jul 2017 00:38:28 +0000
treeherder	autoland@216a5bf264b2 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	sfink
bugs	1380778
milestone	56.0a1
first release with	nightly linux32 5e73b9798464 / 56.0a1 / 20170718100239 / files nightly linux64 5e73b9798464 / 56.0a1 / 20170718100239 / files nightly mac 5e73b9798464 / 56.0a1 / 20170718100333 / files nightly win32 5e73b9798464 / 56.0a1 / 20170718030207 / files nightly win64 5e73b9798464 / 56.0a1 / 20170718030207 / files
last release without	nightly linux32 b4e656e5a996 / 56.0a1 / 20170716100258 / files nightly linux64 b4e656e5a996 / 56.0a1 / 20170716100258 / files nightly mac b4e656e5a996 / 56.0a1 / 20170716100325 / files nightly win32 b4e656e5a996 / 56.0a1 / 20170716030208 / files nightly win64 b4e656e5a996 / 56.0a1 / 20170716030208 / files

--- a/js/src/vm/Shape-inl.h
+++ b/js/src/vm/Shape-inl.h
@@ -153,17 +153,17 @@ GetterSetterWriteBarrierPost(AccessorSha
         AutoEnterOOMUnsafeRegion oomUnsafe;
         if (!nurseryShapes.append(shape))
             oomUnsafe.crash("GetterSetterWriteBarrierPost");
     }
 
     auto& storeBuffer = shape->runtimeFromActiveCooperatingThread()->gc.storeBuffer();
     if (nurseryShapes.length() == 1) {
         storeBuffer.putGeneric(NurseryShapesRef(shape->zone()));
-    } if (nurseryShapes.length() == MaxShapeVectorLength) {
+    } else if (nurseryShapes.length() == MaxShapeVectorLength) {
         storeBuffer.setAboutToOverflow(JS::gcreason::FULL_SHAPE_BUFFER);
     }
 }
 
 inline
 AccessorShape::AccessorShape(const StackShape& other, uint32_t nfixed)
   : Shape(other, nfixed),
     rawGetter(other.rawGetter),