Bug 1081523 - Fix --disable-gcgenerational build bustage from bug 1073700. rs=till
authorJan de Mooij <jdemooij@mozilla.com>
Sat, 11 Oct 2014 10:40:00 -0400
changeset 233233 37e8f50f6264c69e050bfc573293f4b5143f006a
parent 233232 efb340c7b7ce3f074bc4a90f268251a2743a7623
child 233234 24fe4de371259abaabe92df7f08d5bf5b3712392
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstill
bugs1081523, 1073700
milestone35.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 1081523 - Fix --disable-gcgenerational build bustage from bug 1073700. rs=till
js/src/vm/Shape.h
--- a/js/src/vm/Shape.h
+++ b/js/src/vm/Shape.h
@@ -568,25 +568,25 @@ typedef HashSet<ReadBarrieredUnownedBase
                 StackBaseShape,
                 SystemAllocPolicy> BaseShapeSet;
 
 
 class Shape : public gc::TenuredCell
 {
     friend class ::JSObject;
     friend class ::JSFunction;
-    friend class js::Bindings;
-    friend class js::Nursery;
-    friend class js::gc::ForkJoinNursery;
-    friend class js::NativeObject;
-    friend class js::PropertyTree;
-    friend class js::StaticBlockObject;
-    friend class js::ShapeGetterSetterRef;
-    friend struct js::StackShape;
-    friend struct js::StackBaseShape;
+    friend class Bindings;
+    friend class Nursery;
+    friend class gc::ForkJoinNursery;
+    friend class NativeObject;
+    friend class PropertyTree;
+    friend class StaticBlockObject;
+    friend class ShapeGetterSetterRef;
+    friend struct StackShape;
+    friend struct StackBaseShape;
 
   protected:
     HeapPtrBaseShape    base_;
     PreBarrieredId      propid_;
 
     JS_ENUM_HEADER(SlotInfo, uint32_t)
     {
         /* Number of fixed slots in objects with this shape. */