mozilla-central: changeset 298825:4ce461d9ec8e87dcfcfc9f5d2ab1f405b2e4318f

author	Jeff Muizelaar <jmuizelaar@mozilla.com>
	Tue, 24 May 2016 15:38:18 -0400
changeset 298825	4ce461d9ec8e87dcfcfc9f5d2ab1f405b2e4318f
parent 298824	0e1aa8af35b8e3fc54a2e041e131852c76f73d0c
child 298826	c4f8d92b1c7b3ba67385388d626d0d7cb10f88ae
push id	30285
push user	cbook@mozilla.com
push date	Wed, 25 May 2016 13:06:07 +0000
treeherder	mozilla-central@d6d4e8417d2f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	billm
bugs	1273669
milestone	49.0a1
first release with	nightly linux32 d6d4e8417d2f / 49.0a1 / 20160525063710 / files nightly linux64 d6d4e8417d2f / 49.0a1 / 20160525063710 / files nightly mac d6d4e8417d2f / 49.0a1 / 20160525063710 / files nightly win32 d6d4e8417d2f / 49.0a1 / 20160525063710 / files nightly win64 d6d4e8417d2f / 49.0a1 / 20160525063710 / files
last release without	nightly linux32 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly linux64 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly mac 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly win32 829d3be6ba64 / 49.0a1 / 20160524073714 / files nightly win64 829d3be6ba64 / 49.0a1 / 20160524073714 / files

--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -1005,17 +1005,17 @@ inline
 StackBaseShape::StackBaseShape(Shape* shape)
   : flags(shape->getObjectFlags()),
     clasp(shape->getObjectClass()),
     compartment(shape->compartment())
 {}
 
 class MOZ_RAII AutoRooterGetterSetter
 {
-    class Inner : private JS::CustomAutoRooter
+    class Inner final : private JS::CustomAutoRooter
     {
       public:
         inline Inner(ExclusiveContext* cx, uint8_t attrs, GetterOp* pgetter_, SetterOp* psetter_);
 
       private:
         virtual void trace(JSTracer* trc);
 
         uint8_t attrs;