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

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

Issue 664333003: Add remaining @@toStringTag symbols to builtins (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Oops, forgot to add the test cases for Math / JSON Created 6 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/math.js ('k') | src/string-iterator.js » ('j') | src/typedarray.js » ('J')
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 b57064f364fedf5753bbad76a39fd619849c1c68..0e2feed264b483bc2d20e47bcddc9eab66e2b0e2 100644
--- a/src/runtime/runtime-function.cc
+++ b/src/runtime/runtime-function.cc
@@ -67,13 +67,35 @@ RUNTIME_FUNCTION(Runtime_FunctionGetName) {
}
+static String* NameToFunctionName(Isolate* isolate, Name* name) {
Dmitry Lomov (no reviews) 2014/10/24 08:20:47 This function shouldn't use naked pointers - use H
caitp (gmail) 2014/10/24 12:18:33 Done
+ String* stringName = NULL;
Dmitry Lomov (no reviews) 2014/10/24 08:20:47 Handle<String>
+
+ // TODO(caitp): Follow proper rules in section 9.2.11 (SetFunctionName)
Dmitry Lomov (no reviews) 2014/10/24 08:20:47 Yes, fine to do in later CL - our names for getter
+ if (name->IsSymbol()) {
+ Object* symName = Symbol::cast(name)->name();
Dmitry Lomov (no reviews) 2014/10/24 08:20:47 Handle<Object> symName(Handle<Symbol>::cast(name)-
+ if (symName->IsString()) {
+ stringName = String::cast(symName);
+ }
+ } else {
+ stringName = String::cast(name);
+ }
+
+ if (stringName == NULL) {
+ stringName = isolate->heap()->empty_string();
+ }
+
+ return stringName;
+}
+
+
RUNTIME_FUNCTION(Runtime_FunctionSetName) {
SealHandleScope shs(isolate);
DCHECK(args.length() == 2);
CONVERT_ARG_CHECKED(JSFunction, f, 0);
- CONVERT_ARG_CHECKED(String, name, 1);
- f->shared()->set_name(name);
+ CONVERT_ARG_CHECKED(Name, name, 1);
Dmitry Lomov (no reviews) 2014/10/24 08:20:47 CONVERT_ARG_HANDLE_CHECKED In line 92 above, s/Se
+
+ f->shared()->set_name(NameToFunctionName(isolate, name));
return isolate->heap()->undefined_value();
}
« no previous file with comments | « src/math.js ('k') | src/string-iterator.js » ('j') | src/typedarray.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698