diff options
| author | Andreas Gampe <agampe@google.com> | 2017-06-21 21:05:13 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2017-06-22 16:04:07 -0700 |
| commit | 51d80ccca5eb2ea0eef0de836dcc03e0545f63db (patch) | |
| tree | 14ff2bf5b9a9ca86d8a8d6f736cf27d8a1d47554 /cmdline | |
| parent | 19df565ffcb30cb7b5217f074771078f0bb6cc1c (diff) | |
| download | art-51d80ccca5eb2ea0eef0de836dcc03e0545f63db.tar.gz art-51d80ccca5eb2ea0eef0de836dcc03e0545f63db.tar.bz2 art-51d80ccca5eb2ea0eef0de836dcc03e0545f63db.zip | |
ART: Refactor abort code
Remove Runtime::Aborter and let Runtime::Abort set the abort message
on target.
This works around a missing tail-call optimization that leads to a
superfluous frame on the call-stack when aborting.
Partially reverts commit 3fec9ac0d5af1358d216eb2fdc2000ec0205f3f0.
Bug: 62810360
Test: m test-art-host
Test: Manual inspection of abort dump
Change-Id: Ie4efc8bbdc8b665b23081b37a11921fe26b182b4
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/cmdline.h | 2 | ||||
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/cmdline.h b/cmdline/cmdline.h index 98010d7089..18ca944383 100644 --- a/cmdline/cmdline.h +++ b/cmdline/cmdline.h @@ -295,7 +295,7 @@ struct CmdlineArgs { template <typename Args = CmdlineArgs> struct CmdlineMain { int Main(int argc, char** argv) { - InitLogging(argv, Runtime::Aborter); + InitLogging(argv, Runtime::Abort); std::unique_ptr<Args> args = std::unique_ptr<Args>(CreateArguments()); args_ = args.get(); diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index b224ec72de..d957869a76 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -123,7 +123,7 @@ class CmdlineParserTest : public ::testing::Test { using RuntimeParser = ParsedOptions::RuntimeParser; static void SetUpTestCase() { - art::InitLogging(nullptr, art::Runtime::Aborter); // argv = null + art::InitLogging(nullptr, art::Runtime::Abort); // argv = null } virtual void SetUp() { |