OLD | NEW |
1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 Handle<JSMapIterator> key_iterator = | 169 Handle<JSMapIterator> key_iterator = |
170 JSMapIterator::Create(ordered_map, JSMapIterator::kKindKeys); | 170 JSMapIterator::Create(ordered_map, JSMapIterator::kKindKeys); |
171 | 171 |
172 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); | 172 Handle<Map> map = factory->NewMap(JS_OBJECT_TYPE, JSObject::kHeaderSize); |
173 Handle<JSObject> obj = factory->NewJSObjectFromMap(map); | 173 Handle<JSObject> obj = factory->NewJSObjectFromMap(map); |
174 Handle<JSObject> val = factory->NewJSObjectFromMap(map); | 174 Handle<JSObject> val = factory->NewJSObjectFromMap(map); |
175 CHECK(ordered_map->Lookup(obj)->IsTheHole()); | 175 CHECK(ordered_map->Lookup(obj)->IsTheHole()); |
176 ordered_map = OrderedHashMap::Put(ordered_map, obj, val); | 176 ordered_map = OrderedHashMap::Put(ordered_map, obj, val); |
177 CHECK_EQ(1, ordered_map->NumberOfElements()); | 177 CHECK_EQ(1, ordered_map->NumberOfElements()); |
178 CHECK(ordered_map->Lookup(obj)->SameValue(*val)); | 178 CHECK(ordered_map->Lookup(obj)->SameValue(*val)); |
179 ordered_map = OrderedHashMap::Put( | 179 bool was_present = false; |
180 ordered_map, obj, factory->the_hole_value()); | 180 ordered_map = OrderedHashMap::Remove(ordered_map, obj, &was_present); |
| 181 CHECK(was_present); |
181 CHECK_EQ(0, ordered_map->NumberOfElements()); | 182 CHECK_EQ(0, ordered_map->NumberOfElements()); |
182 CHECK(ordered_map->Lookup(obj)->IsTheHole()); | 183 CHECK(ordered_map->Lookup(obj)->IsTheHole()); |
183 | 184 |
184 // Test for collisions/chaining | 185 // Test for collisions/chaining |
185 Handle<JSObject> obj1 = factory->NewJSObjectFromMap(map); | 186 Handle<JSObject> obj1 = factory->NewJSObjectFromMap(map); |
186 Handle<JSObject> obj2 = factory->NewJSObjectFromMap(map); | 187 Handle<JSObject> obj2 = factory->NewJSObjectFromMap(map); |
187 Handle<JSObject> obj3 = factory->NewJSObjectFromMap(map); | 188 Handle<JSObject> obj3 = factory->NewJSObjectFromMap(map); |
188 Handle<JSObject> val1 = factory->NewJSObjectFromMap(map); | 189 Handle<JSObject> val1 = factory->NewJSObjectFromMap(map); |
189 Handle<JSObject> val2 = factory->NewJSObjectFromMap(map); | 190 Handle<JSObject> val2 = factory->NewJSObjectFromMap(map); |
190 Handle<JSObject> val3 = factory->NewJSObjectFromMap(map); | 191 Handle<JSObject> val3 = factory->NewJSObjectFromMap(map); |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
231 CheckIterResultObject( | 232 CheckIterResultObject( |
232 isolate, JSMapIterator::Next(key_iterator), obj, false); | 233 isolate, JSMapIterator::Next(key_iterator), obj, false); |
233 CheckIterResultObject( | 234 CheckIterResultObject( |
234 isolate, JSMapIterator::Next(key_iterator), obj4, false); | 235 isolate, JSMapIterator::Next(key_iterator), obj4, false); |
235 CheckIterResultObject(isolate, | 236 CheckIterResultObject(isolate, |
236 JSMapIterator::Next(key_iterator), | 237 JSMapIterator::Next(key_iterator), |
237 factory->undefined_value(), | 238 factory->undefined_value(), |
238 true); | 239 true); |
239 | 240 |
240 // Test shrinking | 241 // Test shrinking |
241 ordered_map = OrderedHashMap::Put( | 242 ordered_map = OrderedHashMap::Remove(ordered_map, obj, &was_present); |
242 ordered_map, obj, factory->the_hole_value()); | 243 CHECK(was_present); |
243 ordered_map = OrderedHashMap::Put( | 244 ordered_map = OrderedHashMap::Remove(ordered_map, obj1, &was_present); |
244 ordered_map, obj1, factory->the_hole_value()); | 245 CHECK(was_present); |
245 ordered_map = OrderedHashMap::Put( | 246 ordered_map = OrderedHashMap::Remove(ordered_map, obj2, &was_present); |
246 ordered_map, obj2, factory->the_hole_value()); | 247 CHECK(was_present); |
247 ordered_map = OrderedHashMap::Put( | 248 ordered_map = OrderedHashMap::Remove(ordered_map, obj3, &was_present); |
248 ordered_map, obj3, factory->the_hole_value()); | 249 CHECK(was_present); |
249 CHECK_EQ(1, ordered_map->NumberOfElements()); | 250 CHECK_EQ(1, ordered_map->NumberOfElements()); |
250 CHECK_EQ(2, ordered_map->NumberOfBuckets()); | 251 CHECK_EQ(2, ordered_map->NumberOfBuckets()); |
251 } | 252 } |
252 | 253 |
253 | 254 |
254 } | 255 } |
OLD | NEW |