Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Side by Side Diff: src/runtime/runtime-array.cc

Issue 1375003002: Teach JSReceiver::GetKeys() how to include symbols (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: rebased Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/objects.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 the V8 project authors. All rights reserved. 1 // Copyright 2014 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/runtime/runtime-utils.h" 5 #include "src/runtime/runtime-utils.h"
6 6
7 #include "src/arguments.h" 7 #include "src/arguments.h"
8 #include "src/conversions-inl.h" 8 #include "src/conversions-inl.h"
9 #include "src/elements.h" 9 #include "src/elements.h"
10 #include "src/factory.h" 10 #include "src/factory.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 PrototypeIterator::GetCurrent<JSObject>(iter) 213 PrototypeIterator::GetCurrent<JSObject>(iter)
214 ->HasIndexedInterceptor()) { 214 ->HasIndexedInterceptor()) {
215 // Bail out if we find a proxy or interceptor, likely not worth 215 // Bail out if we find a proxy or interceptor, likely not worth
216 // collecting keys in that case. 216 // collecting keys in that case.
217 return *isolate->factory()->NewNumberFromUint(length); 217 return *isolate->factory()->NewNumberFromUint(length);
218 } 218 }
219 Handle<JSObject> current = PrototypeIterator::GetCurrent<JSObject>(iter); 219 Handle<JSObject> current = PrototypeIterator::GetCurrent<JSObject>(iter);
220 Handle<FixedArray> current_keys = 220 Handle<FixedArray> current_keys =
221 isolate->factory()->NewFixedArray(current->NumberOfOwnElements(NONE)); 221 isolate->factory()->NewFixedArray(current->NumberOfOwnElements(NONE));
222 current->GetOwnElementKeys(*current_keys, NONE); 222 current->GetOwnElementKeys(*current_keys, NONE);
223 accumulator.AddKeys(current_keys, FixedArray::ALL_KEYS); 223 accumulator.AddKeys(current_keys, INCLUDE_SYMBOLS);
224 } 224 }
225 // Erase any keys >= length. 225 // Erase any keys >= length.
226 // TODO(adamk): Remove this step when the contract of %GetArrayKeys 226 // TODO(adamk): Remove this step when the contract of %GetArrayKeys
227 // is changed to let this happen on the JS side. 227 // is changed to let this happen on the JS side.
228 Handle<FixedArray> keys = accumulator.GetKeys(); 228 Handle<FixedArray> keys = accumulator.GetKeys();
229 for (int i = 0; i < keys->length(); i++) { 229 for (int i = 0; i < keys->length(); i++) {
230 if (NumberToUint32(keys->get(i)) >= length) keys->set_undefined(i); 230 if (NumberToUint32(keys->get(i)) >= length) keys->set_undefined(i);
231 } 231 }
232 return *isolate->factory()->NewJSArrayWithElements(keys); 232 return *isolate->factory()->NewJSArrayWithElements(keys);
233 } 233 }
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 492
493 RUNTIME_FUNCTION(Runtime_FastOneByteArrayJoin) { 493 RUNTIME_FUNCTION(Runtime_FastOneByteArrayJoin) {
494 SealHandleScope shs(isolate); 494 SealHandleScope shs(isolate);
495 DCHECK(args.length() == 2); 495 DCHECK(args.length() == 2);
496 // Returning undefined means that this fast path fails and one has to resort 496 // Returning undefined means that this fast path fails and one has to resort
497 // to a slow path. 497 // to a slow path.
498 return isolate->heap()->undefined_value(); 498 return isolate->heap()->undefined_value();
499 } 499 }
500 } // namespace internal 500 } // namespace internal
501 } // namespace v8 501 } // namespace v8
OLDNEW
« no previous file with comments | « src/objects.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698