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

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

Issue 1093183006: [es6] Map/Set size getter should have "get size" name (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: NameToFunctionName might allocate now so we need to be careful about execution order Created 5 years, 8 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 | « no previous file | src/v8natives.js » ('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 c211e1895f742408281a18f4de7db6b77bcdd202..ac3973f9db9d0c8117c8cf71b928f896ca8dfd43 100644
--- a/src/runtime/runtime-function.cc
+++ b/src/runtime/runtime-function.cc
@@ -76,10 +76,10 @@ static Handle<String> NameToFunctionName(Handle<Name> name) {
Handle<Object> description(Handle<Symbol>::cast(name)->name(),
name->GetIsolate());
if (description->IsString()) {
- stringName = Handle<String>::cast(description);
+ return Handle<String>::cast(description);
}
} else {
- stringName = Handle<String>::cast(name);
+ return String::Flatten(Handle<String>::cast(name));
}
return stringName;
@@ -93,7 +93,10 @@ RUNTIME_FUNCTION(Runtime_FunctionSetName) {
CONVERT_ARG_HANDLE_CHECKED(JSFunction, f, 0);
CONVERT_ARG_HANDLE_CHECKED(Name, name, 1);
- f->shared()->set_name(*NameToFunctionName(name));
+ // NameToFunctionName may cause allocations so we need to be careful about
adamk 2015/04/24 16:29:07 Not sure this comment adds much, I'd tend to expec
+ // execution order here.
+ name = NameToFunctionName(name);
+ f->shared()->set_name(*name);
return isolate->heap()->undefined_value();
}
« no previous file with comments | « no previous file | src/v8natives.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698