Revert r11681 https://chromiumcodereview.appspot.com/10448011

src/objects-inl.h

Index: src/objects-inl.h
===================================================================
--- src/objects-inl.h	(revision 11684)
+++ src/objects-inl.h	(working copy)
@@ -1611,21 +1611,13 @@
 }
 
 
-bool JSObject::TooManyFastProperties(int properties) {
+int JSObject::MaxFastProperties() {
   // Allow extra fast properties if the object has more than
-  // kFastPropertiesSoftLimit in-object properties. When this is the case,
+  // kMaxFastProperties in-object properties. When this is the case,
   // it is very unlikely that the object is being used as a dictionary
   // and there is a good chance that allowing more map transitions
   // will be worth it.
-  int inobject = map()->inobject_properties();
-
-  int limit;
-  if (map()->used_for_prototype()) {
-    limit = Max(inobject, kMaxFastProperties);
-  } else {
-    limit = Max(inobject, kFastPropertiesSoftLimit);
-  }
-  return properties >= limit;
+  return Max(map()->inobject_properties(), kMaxFastProperties);
 }
 
 
@@ -2938,20 +2930,6 @@
 }
 
 
-void Map::set_used_for_prototype(bool value) {
-  if (value) {
-    set_bit_field3(bit_field3() | (1 << kUsedForPrototype));
-  } else {
-    set_bit_field3(bit_field3() & ~(1 << kUsedForPrototype));
-  }
-}
-
-
-bool Map::used_for_prototype() {
-  return ((1 << kUsedForPrototype) & bit_field3()) != 0;
-}
-
-
 JSFunction* Map::unchecked_constructor() {
   return reinterpret_cast<JSFunction*>(READ_FIELD(this, kConstructorOffset));
 }
@@ -4102,7 +4080,6 @@
   return instance_prototype();
 }
 
-
 bool JSFunction::should_have_prototype() {
   return map()->function_with_prototype();
 }