Bug 1346217 part 9 - Enable some assertions that were commented out a long time ago. r=till
authorJan de Mooij <jdemooij@mozilla.com>
Fri, 01 Sep 2017 15:47:26 +0200
changeset 378188 312f0675cbc1d29ed3b9f293fad50d43f8541f89
parent 378187 4522cdb5be3f3d8e7fc93fcb9a00b50dc8bcdf8f
child 378189 0ed64fbf607c774466f8a3ff93a926d980995d77
push id94427
push userjandemooij@gmail.com
push dateFri, 01 Sep 2017 13:47:56 +0000
treeherdermozilla-inbound@312f0675cbc1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstill
bugs1346217
milestone57.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 1346217 part 9 - Enable some assertions that were commented out a long time ago. r=till
js/src/vm/Shape.cpp
--- a/js/src/vm/Shape.cpp
+++ b/js/src/vm/Shape.cpp
@@ -348,18 +348,20 @@ NativeObject::getChildProperty(JSContext
         }
         shape->initDictionaryShape(child, obj->numFixedSlots(), &obj->shape_);
         return shape;
     }
 
     Shape* shape = cx->zone()->propertyTree().inlinedGetChild(cx, parent, child);
     if (!shape)
         return nullptr;
-    //MOZ_ASSERT(shape->parent == parent);
-    //MOZ_ASSERT_IF(parent != lastProperty(), parent == lastProperty()->parent);
+
+    MOZ_ASSERT(shape->parent == parent);
+    MOZ_ASSERT_IF(parent != obj->lastProperty(), parent == obj->lastProperty()->parent);
+
     if (!obj->setLastProperty(cx, shape))
         return nullptr;
     return shape;
 }
 
 /* static */ bool
 js::NativeObject::toDictionaryMode(JSContext* cx, HandleNativeObject obj)
 {