From 2c4dfb60c8ceb79d2fbceba93e7646b6933aaeae Mon Sep 17 00:00:00 2001 From: "koda@google.com" Date: Fri, 8 May 2015 22:34:17 +0000 Subject: [PATCH] Don't attempt to walk the native stack by default. This was unintentially enabled by default as a consequence of https://codereview.chromium.org/1104323003/ BUG=23368 R=johnmccutchan@google.com Review URL: https://codereview.chromium.org//1130253005 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@45666 260f80e4-7a28-3924-810f-c04153c831b5 --- runtime/vm/profiler.cc | 2 +- tools/gyp/configurations_android.gypi | 4 ++-- tools/gyp/configurations_make.gypi | 4 ++-- tools/gyp/configurations_msvs.gypi | 4 ++-- tools/gyp/configurations_xcode.gypi | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/vm/profiler.cc b/runtime/vm/profiler.cc index 29eb1e1d768..8226d93da8a 100644 --- a/runtime/vm/profiler.cc +++ b/runtime/vm/profiler.cc @@ -37,7 +37,7 @@ DEFINE_FLAG(bool, trace_profiled_isolates, false, "Trace profiled isolates."); #endif DEFINE_FLAG(int, profile_depth, 8, "Maximum number stack frames walked. Minimum 1. Maximum 255."); -#if defined(PROFILE_NATIVE_CODE) || defined(USING_SIMULATOR) +#if defined(USING_SIMULATOR) DEFINE_FLAG(bool, profile_vm, true, "Always collect native stack traces."); #else diff --git a/tools/gyp/configurations_android.gypi b/tools/gyp/configurations_android.gypi index c60d776d577..80ff1c66b27 100644 --- a/tools/gyp/configurations_android.gypi +++ b/tools/gyp/configurations_android.gypi @@ -57,7 +57,7 @@ '-fno-omit-frame-pointer', ], 'defines': [ - 'PROFILE_NATIVE_CODE' + 'NATIVE_CODE_HAS_FRAME_POINTERS' ], }], ], @@ -82,7 +82,7 @@ '-fno-omit-frame-pointer', ], 'defines': [ - 'PROFILE_NATIVE_CODE' + 'NATIVE_CODE_HAS_FRAME_POINTERS' ], }], ], diff --git a/tools/gyp/configurations_make.gypi b/tools/gyp/configurations_make.gypi index 1556f16f7dd..15eee37a9a4 100644 --- a/tools/gyp/configurations_make.gypi +++ b/tools/gyp/configurations_make.gypi @@ -200,7 +200,7 @@ '-fno-omit-frame-pointer', ], 'defines': [ - 'PROFILE_NATIVE_CODE' + 'NATIVE_CODE_HAS_FRAME_POINTERS' ], }], ], @@ -217,7 +217,7 @@ '-fno-omit-frame-pointer', ], 'defines': [ - 'PROFILE_NATIVE_CODE' + 'NATIVE_CODE_HAS_FRAME_POINTERS' ], }], ], diff --git a/tools/gyp/configurations_msvs.gypi b/tools/gyp/configurations_msvs.gypi index 46604eb1ca6..3c859ce89e1 100644 --- a/tools/gyp/configurations_msvs.gypi +++ b/tools/gyp/configurations_msvs.gypi @@ -63,7 +63,7 @@ }, }, 'defines': [ - 'PROFILE_NATIVE_CODE' + 'NATIVE_CODE_HAS_FRAME_POINTERS' ], }], ], @@ -107,7 +107,7 @@ }, }, 'defines': [ - 'PROFILE_NATIVE_CODE' + 'NATIVE_CODE_HAS_FRAME_POINTERS' ], }], ], diff --git a/tools/gyp/configurations_xcode.gypi b/tools/gyp/configurations_xcode.gypi index 6bd04527e34..3f22df5ec59 100644 --- a/tools/gyp/configurations_xcode.gypi +++ b/tools/gyp/configurations_xcode.gypi @@ -63,7 +63,7 @@ ], }, 'defines': [ - 'PROFILE_NATIVE_CODE', + 'NATIVE_CODE_HAS_FRAME_POINTERS', ], }], ],