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

Unified Diff: runtime/vm/profiler.cc

Issue 1146433005: Move stack walker construction outside of SEH try block (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/profiler.cc
diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc
index e78fe399bfc337b1cdc7d64f10a08b47a067b68a..f5899b6c54c2334673c28d20707fa9dd4d44c12d 100644
--- a/runtime/vm/profiler.cc
+++ b/runtime/vm/profiler.cc
@@ -953,6 +953,23 @@ static void CollectSample(Isolate* isolate,
uword pc,
uword fp,
uword sp) {
+ ProfilerNativeStackWalker nativeStackWalker(sample,
+ stack_lower,
+ stack_upper,
+ pc,
+ fp,
+ sp);
+
+ ProfilerDartExitStackWalker dartExitStackWalker(isolate, sample);
+
+ ProfilerDartStackWalker dartStackWalker(isolate,
+ sample,
+ stack_lower,
+ stack_upper,
+ pc,
+ fp,
+ sp);
+
#if defined(TARGET_OS_WINDOWS)
// Use structured exception handling to trap guard page access on Windows.
__try {
@@ -963,27 +980,13 @@ static void CollectSample(Isolate* isolate,
if (FLAG_profile_vm) {
// Always walk the native stack collecting both native and Dart frames.
- ProfilerNativeStackWalker stackWalker(sample,
- stack_lower,
- stack_upper,
- pc,
- fp,
- sp);
- stackWalker.walk();
+ nativeStackWalker.walk();
} else if (exited_dart_code) {
// We have a valid exit frame info, use the Dart stack walker.
- ProfilerDartExitStackWalker stackWalker(isolate, sample);
- stackWalker.walk();
+ dartExitStackWalker.walk();
} else if (in_dart_code) {
// We are executing Dart code. We have frame pointers.
- ProfilerDartStackWalker stackWalker(isolate,
- sample,
- stack_lower,
- stack_upper,
- pc,
- fp,
- sp);
- stackWalker.walk();
+ dartStackWalker.walk();
} else {
sample->set_vm_tag(VMTag::kEmbedderTagId);
sample->SetAt(0, pc);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698