Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index 17351755714cb80ed076b491010f09b6793ee1e3..ae1bcbc4c1019ff5edad7cb1dd9a07aa158a5bc6 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -3619,13 +3619,12 @@ MaybeObject* JSObject::SetHiddenProperty(String* key, Object* value) { |
return JSObject::cast(proxy_parent)->SetHiddenProperty(key, value); |
} |
ASSERT(!IsJSGlobalProxy()); |
- |
- // If there is no backing store yet, store the identity hash inline. |
MaybeObject* hidden_lookup = |
GetHiddenPropertiesHashTable(ONLY_RETURN_INLINE_VALUE); |
- ASSERT(!hidden_lookup->IsFailure()); |
+ ASSERT(!hidden_lookup->IsFailure()); // No failure when passing false as arg. |
Yang
2012/10/22 12:35:23
Not your fault, but what I think what I was trying
Michael Starzinger
2012/10/22 12:45:52
Done. As discussed offline, the whole assertion ca
|
Object* inline_value = hidden_lookup->ToObjectUnchecked(); |
+ // If there is no backing store yet, store the identity hash inline. |
if (value->IsSmi() && |
key == GetHeap()->identity_hash_symbol() && |
(inline_value->IsUndefined() || inline_value->IsSmi())) { |
@@ -3662,15 +3661,17 @@ void JSObject::DeleteHiddenProperty(String* key) { |
JSObject::cast(proxy_parent)->DeleteHiddenProperty(key); |
return; |
} |
+ ASSERT(!IsJSGlobalProxy()); |
MaybeObject* hidden_lookup = |
GetHiddenPropertiesHashTable(ONLY_RETURN_INLINE_VALUE); |
ASSERT(!hidden_lookup->IsFailure()); // No failure when passing false as arg. |
Yang
2012/10/22 12:35:23
Ditto.
Michael Starzinger
2012/10/22 12:45:52
Done. Likewise.
|
- if (hidden_lookup->ToObjectUnchecked()->IsUndefined()) return; |
+ Object* inline_value = hidden_lookup->ToObjectUnchecked(); |
+ |
// We never delete (inline-stored) identity hashes. |
- ASSERT(!hidden_lookup->ToObjectUnchecked()->IsSmi()); |
+ ASSERT(key != GetHeap()->identity_hash_symbol()); |
+ if (inline_value->IsUndefined() || inline_value->IsSmi()) return; |
- ObjectHashTable* hashtable = |
- ObjectHashTable::cast(hidden_lookup->ToObjectUnchecked()); |
+ ObjectHashTable* hashtable = ObjectHashTable::cast(inline_value); |
MaybeObject* delete_result = hashtable->Put(key, GetHeap()->the_hole_value()); |
USE(delete_result); |
ASSERT(!delete_result->IsFailure()); // Delete does not cause GC. |