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

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

Issue 1428823002: [es6] Fix Function and GeneratorFunction built-ins subclassing. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@subclass
Patch Set: Addressing comments 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/runtime/runtime.h ('k') | src/runtime/runtime-object.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/runtime/runtime-function.cc
diff --git a/src/runtime/runtime-function.cc b/src/runtime/runtime-function.cc
index f994ee336561a3c51da186de4783480b75bf0a92..e306b53a83e7821a9a2bdd02152f07226656baad 100644
--- a/src/runtime/runtime-function.cc
+++ b/src/runtime/runtime-function.cc
@@ -47,12 +47,40 @@ RUNTIME_FUNCTION(Runtime_FunctionNameShouldPrintAsAnonymous) {
}
-RUNTIME_FUNCTION(Runtime_FunctionMarkNameShouldPrintAsAnonymous) {
+RUNTIME_FUNCTION(Runtime_CompleteFunctionConstruction) {
SealHandleScope shs(isolate);
- DCHECK(args.length() == 1);
- CONVERT_ARG_CHECKED(JSFunction, f, 0);
- f->shared()->set_name_should_print_as_anonymous(true);
- return isolate->heap()->undefined_value();
+ DCHECK(args.length() == 3);
+ CONVERT_ARG_HANDLE_CHECKED(JSFunction, func, 0);
+ CONVERT_ARG_HANDLE_CHECKED(JSFunction, constructor, 1);
+ CONVERT_ARG_HANDLE_CHECKED(Object, new_target, 2);
+ func->shared()->set_name_should_print_as_anonymous(true);
+
+ // If new.target is equal to |constructor| then the function |func| created
+ // is already correctly setup and nothing else should be done here.
+ // But if new.target is not equal to |constructor| then we are have a
+ // Function builtin subclassing case and therefore the function |func|
+ // has wrong initial map. To fix that we create a new function object with
+ // correct initial map.
+ if (new_target->IsUndefined() || *constructor == *new_target) {
+ return *func;
+ }
+
+ // Create a new JSFunction object with correct initial map.
+ HandleScope handle_scope(isolate);
+ Handle<JSFunction> original_constructor =
+ Handle<JSFunction>::cast(new_target);
+
+ DCHECK(constructor->has_initial_map());
+ Handle<Map> initial_map =
+ JSFunction::EnsureDerivedHasInitialMap(original_constructor, constructor);
+
+ Handle<SharedFunctionInfo> shared_info(func->shared(), isolate);
+ Handle<Context> context(func->context(), isolate);
+ Handle<JSFunction> result =
+ isolate->factory()->NewFunctionFromSharedFunctionInfo(
+ initial_map, shared_info, context, NOT_TENURED);
+ DCHECK_EQ(func->IsConstructor(), result->IsConstructor());
+ return *result;
}
« no previous file with comments | « src/runtime/runtime.h ('k') | src/runtime/runtime-object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698