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

Side by Side Diff: src/isolate.cc

Issue 417253003: Make CPU profiler function names match ones from StackFrame iterator. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Rebaseline Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « src/cpu-profiler.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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #include "src/v8.h" 7 #include "src/v8.h"
8 8
9 #include "src/ast.h" 9 #include "src/ast.h"
10 #include "src/base/platform/platform.h" 10 #include "src/base/platform/platform.h"
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 stack_frame, script_name_key, handle(script->name(), this), NONE); 516 stack_frame, script_name_key, handle(script->name(), this), NONE);
517 } 517 }
518 518
519 if (options & StackTrace::kScriptNameOrSourceURL) { 519 if (options & StackTrace::kScriptNameOrSourceURL) {
520 Handle<Object> result = Script::GetNameOrSourceURL(script); 520 Handle<Object> result = Script::GetNameOrSourceURL(script);
521 JSObject::AddProperty( 521 JSObject::AddProperty(
522 stack_frame, script_name_or_source_url_key, result, NONE); 522 stack_frame, script_name_or_source_url_key, result, NONE);
523 } 523 }
524 524
525 if (options & StackTrace::kFunctionName) { 525 if (options & StackTrace::kFunctionName) {
526 Handle<Object> fun_name(fun->shared()->name(), this); 526 Handle<Object> fun_name(fun->shared()->DebugName(), this);
527 if (!fun_name->BooleanValue()) {
528 fun_name = Handle<Object>(fun->shared()->inferred_name(), this);
529 }
530 JSObject::AddProperty(stack_frame, function_key, fun_name, NONE); 527 JSObject::AddProperty(stack_frame, function_key, fun_name, NONE);
531 } 528 }
532 529
533 if (options & StackTrace::kIsEval) { 530 if (options & StackTrace::kIsEval) {
534 Handle<Object> is_eval = 531 Handle<Object> is_eval =
535 script->compilation_type() == Script::COMPILATION_TYPE_EVAL ? 532 script->compilation_type() == Script::COMPILATION_TYPE_EVAL ?
536 factory()->true_value() : factory()->false_value(); 533 factory()->true_value() : factory()->false_value();
537 JSObject::AddProperty(stack_frame, eval_key, is_eval, NONE); 534 JSObject::AddProperty(stack_frame, eval_key, is_eval, NONE);
538 } 535 }
539 536
(...skipping 1829 matching lines...) Expand 10 before | Expand all | Expand 10 after
2369 if (prev_ && prev_->Intercept(flag)) return true; 2366 if (prev_ && prev_->Intercept(flag)) return true;
2370 // Then check whether this scope intercepts. 2367 // Then check whether this scope intercepts.
2371 if ((flag & intercept_mask_)) { 2368 if ((flag & intercept_mask_)) {
2372 intercepted_flags_ |= flag; 2369 intercepted_flags_ |= flag;
2373 return true; 2370 return true;
2374 } 2371 }
2375 return false; 2372 return false;
2376 } 2373 }
2377 2374
2378 } } // namespace v8::internal 2375 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/cpu-profiler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698