Revert trunk to bleeding_edge at r12484

src/property.h

Index: src/property.h
diff --git a/src/property.h b/src/property.h
index 9eb4194b424bef8fa5f4e975b49c7d4e60ccec47..6bf52a701902761f0f30d9288ef816eb6c2a2b10 100644
--- a/src/property.h
+++ b/src/property.h
@@ -68,7 +68,7 @@ class Descriptor BASE_EMBEDDED {
     details_ = PropertyDetails(details_.attributes(), details_.type(), index);
   }
 
-  void SetSortedKeyIndex(int index) { details_ = details_.set_pointer(index); }
+  void SetSortedKey(int index) { details_ = details_.set_pointer(index); }
 
  private:
   String* key_;
@@ -384,7 +384,6 @@ class LookupResult BASE_EMBEDDED {
 
   Object* GetValueFromMap(Map* map) const {
     ASSERT(lookup_type_ == DESCRIPTOR_TYPE);
-    ASSERT(number_ < map->NumberOfOwnDescriptors());
     return map->instance_descriptors()->GetValue(number_);
   }