Backed out changeset e11754955e76 (bug 1282408) for compilation failures. r=backout CLOSED TREE
authorMark Banner <standard8@mozilla.com>
Mon, 04 Sep 2017 11:26:11 +0100
changeset 428327 eaa3ad46271ea6f3813cd7254c7b18fd06ac694b
parent 428326 e11754955e760666b46ad6631333d3b1d97df34d
child 428328 39eb143530ce3583c8f44dcccac8adbb0c86a18b
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1282408
milestone57.0a1
backs oute11754955e760666b46ad6631333d3b1d97df34d
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
Backed out changeset e11754955e76 (bug 1282408) for compilation failures. r=backout CLOSED TREE
js/src/vm/Scope.h
--- a/js/src/vm/Scope.h
+++ b/js/src/vm/Scope.h
@@ -1095,23 +1095,23 @@ class BindingIter
     //
     //            imports - name
     // positional formals - environment slot or name
     //      other formals - environment slot or name
     //    top-level funcs - environment slot or name
     //               vars - environment slot or name
     //               lets - environment slot or name
     //             consts - environment slot or name
-    MOZ_INIT_OUTSIDE_CTOR uint32_t positionalFormalStart_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t nonPositionalFormalStart_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t topLevelFunctionStart_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t varStart_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t letStart_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t constStart_;
-    MOZ_INIT_OUTSIDE_CTOR length_uint32_t length_;
+    uint32_t positionalFormalStart_;
+    uint32_t nonPositionalFormalStart_;
+    uint32_t topLevelFunctionStart_;
+    uint32_t varStart_;
+    uint32_t letStart_;
+    uint32_t constStart_;
+    uint32_t length_;
 
     uint32_t index_;
 
     enum Flags : uint8_t {
         CannotHaveSlots = 0,
         CanHaveArgumentSlots = 1 << 0,
         CanHaveFrameSlots = 1 << 1,
         CanHaveEnvironmentSlots = 1 << 2,
@@ -1121,22 +1121,22 @@ class BindingIter
         IgnoreDestructuredFormalParameters = 1 << 4,
 
         // Truly I hate named lambdas.
         IsNamedLambda = 1 << 5
     };
 
     static const uint8_t CanHaveSlotsMask = 0x7;
 
-    MOZ_INIT_OUTSIDE_CTOR uint8_t flags_;
-    MOZ_INIT_OUTSIDE_CTOR uint16_t argumentSlot_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t frameSlot_;
-    MOZ_INIT_OUTSIDE_CTOR uint32_t environmentSlot_;
+    uint8_t flags_;
+    uint16_t argumentSlot_;
+    uint32_t frameSlot_;
+    uint32_t environmentSlot_;
 
-    MOZ_INIT_OUTSIDE_CTOR BindingName* names_;
+    BindingName* names_;
 
     void init(uint32_t positionalFormalStart, uint32_t nonPositionalFormalStart,
               uint32_t topLevelFunctionStart, uint32_t varStart,
               uint32_t letStart, uint32_t constStart,
               uint8_t flags, uint32_t firstFrameSlot, uint32_t firstEnvironmentSlot,
               BindingName* names, uint32_t length)
     {
         positionalFormalStart_ = positionalFormalStart;