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

Unified Diff: src/runtime/runtime-scopes.cc

Issue 1569223002: [runtime] Cleanup runtime support for rest arguments. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/runtime/runtime.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/runtime/runtime-scopes.cc
diff --git a/src/runtime/runtime-scopes.cc b/src/runtime/runtime-scopes.cc
index c21f4bae596ae9d4948ffc089fb2baf76196e7b7..b52474ab45ffa4e92bf52eebe2b0aa926380fc43 100644
--- a/src/runtime/runtime-scopes.cc
+++ b/src/runtime/runtime-scopes.cc
@@ -641,46 +641,22 @@ RUNTIME_FUNCTION(Runtime_NewStrictArguments) {
}
-static Handle<JSArray> NewRestParam(Isolate* isolate, Object** parameters,
- int num_params, int rest_index) {
- parameters -= rest_index;
- int num_elements = std::max(0, num_params - rest_index);
- Handle<FixedArray> elements =
- isolate->factory()->NewUninitializedFixedArray(num_elements);
- for (int i = 0; i < num_elements; ++i) {
- elements->set(i, *--parameters);
- }
- return isolate->factory()->NewJSArrayWithElements(elements, FAST_ELEMENTS,
- num_elements);
-}
-
-
RUNTIME_FUNCTION(Runtime_NewRestParam) {
HandleScope scope(isolate);
DCHECK(args.length() == 3);
CONVERT_SMI_ARG_CHECKED(num_params, 0);
Object** parameters = reinterpret_cast<Object**>(args[1]);
CONVERT_SMI_ARG_CHECKED(rest_index, 2);
-
- return *NewRestParam(isolate, parameters, num_params, rest_index);
-}
-
-
-RUNTIME_FUNCTION(Runtime_NewRestParamSlow) {
- HandleScope scope(isolate);
- DCHECK(args.length() == 1);
- CONVERT_SMI_ARG_CHECKED(rest_index, 0);
-
+#ifdef DEBUG
+ // This runtime function does not materialize the correct arguments when the
+ // caller has been inlined, better make sure we are not hitting that case.
JavaScriptFrameIterator it(isolate);
-
- // Find the frame that holds the actual arguments passed to the function.
- it.AdvanceToArgumentsFrame();
- JavaScriptFrame* frame = it.frame();
-
- int argument_count = frame->GetArgumentsLength();
- Object** parameters = reinterpret_cast<Object**>(frame->GetParameterSlot(-1));
-
- return *NewRestParam(isolate, parameters, argument_count, rest_index);
+ DCHECK(!it.frame()->HasInlinedFrames());
+#endif // DEBUG
+ Handle<JSFunction> callee;
+ ParameterArguments argument_getter(parameters);
+ return *NewRestArguments(isolate, callee, argument_getter, num_params,
+ rest_index);
}
« no previous file with comments | « src/runtime/runtime.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698