diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-02-24 08:10:57 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-02-24 08:10:57 +0000 |
| commit | a5ca888d715cd0c6c421313211caa1928be3e399 (patch) | |
| tree | bdb08a2cbcf277ab7f02626a23b52a3fdf272ffe /cmdline | |
| parent | 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4 (diff) | |
| download | art-a5ca888d715cd0c6c421313211caa1928be3e399.zip art-a5ca888d715cd0c6c421313211caa1928be3e399.tar.gz art-a5ca888d715cd0c6c421313211caa1928be3e399.tar.bz2 | |
Revert "Add JIT"
Sorry, run-test crashes on target:
0-05 12:15:51.633 I/DEBUG (27995): Abort message: 'art/runtime/mirror/art_method.cc:349] Check failed: PcIsWithinQuickCode(reinterpret_cast<uintptr_t>(code), pc) java.lang.Throwable java.lang.Throwable.fillInStackTrace() pc=71e3366b code=0x71e3362d size=ad000000'
10-05 12:15:51.633 I/DEBUG (27995): r0 00000000 r1 0000542b r2 00000006 r3 00000000
10-05 12:15:51.633 I/DEBUG (27995): r4 00000006 r5 b6f9addc r6 00000002 r7 0000010c
10-05 12:15:51.633 I/DEBUG (27995): r8 b63fe1e8 r9 be8e1418 sl b6427400 fp b63fcce0
10-05 12:15:51.633 I/DEBUG (27995): ip 0000542b sp be8e1358 lr b6e9a27b pc b6e9c280 cpsr 40070010
10-05 12:15:51.633 I/DEBUG (27995):
Bug: 17950037
This reverts commit 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4.
Change-Id: I6f88849bc6f2befed0c0aaa0b7b2a08c967a83c3
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/cmdline_parser_test.cc | 25 | ||||
| -rw-r--r-- | cmdline/cmdline_types.h | 2 |
2 files changed, 3 insertions, 24 deletions
diff --git a/cmdline/cmdline_parser_test.cc b/cmdline/cmdline_parser_test.cc index 9c248d4..288f7ac 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -410,26 +410,6 @@ TEST_F(CmdlineParserTest, TestCompilerOption) { } // TEST_F /* -* -Xjit, -Xnojit, -Xjitcodecachesize, Xjitcompilethreshold -*/ -TEST_F(CmdlineParserTest, TestJitOptions) { - /* - * Test successes - */ - { - EXPECT_SINGLE_PARSE_VALUE(true, "-Xjit", M::UseJIT); - EXPECT_SINGLE_PARSE_VALUE(false, "-Xnojit", M::UseJIT); - } - { - EXPECT_SINGLE_PARSE_VALUE(MemoryKiB(16 * KB), "-Xjitcodecachesize:16K", M::JITCodeCacheCapacity); - EXPECT_SINGLE_PARSE_VALUE(MemoryKiB(16 * MB), "-Xjitcodecachesize:16M", M::JITCodeCacheCapacity); - } - { - EXPECT_SINGLE_PARSE_VALUE(12345u, "-Xjitthreshold:12345", M::JITCompileThreshold); - } -} // TEST_F - -/* * -X-profile-* */ TEST_F(CmdlineParserTest, TestProfilerOptions) { @@ -514,8 +494,9 @@ TEST_F(CmdlineParserTest, TestIgnoredArguments) { "-dsa", "-enablesystemassertions", "-disablesystemassertions", "-Xrs", "-Xint:abdef", "-Xdexopt:foobar", "-Xnoquithandler", "-Xjnigreflimit:ixnay", "-Xgenregmap", "-Xnogenregmap", "-Xverifyopt:never", "-Xcheckdexsum", "-Xincludeselectedop", "-Xjitop:noop", - "-Xincludeselectedmethod", "-Xjitblocking", "-Xjitmethod:_", "-Xjitclass:nosuchluck", - "-Xjitoffset:none", "-Xjitconfig:yes", "-Xjitcheckcg", "-Xjitverbose", "-Xjitprofile", + "-Xincludeselectedmethod", "-Xjitthreshold:123", "-Xjitcodecachesize:12345", + "-Xjitblocking", "-Xjitmethod:_", "-Xjitclass:nosuchluck", "-Xjitoffset:none", + "-Xjitconfig:yes", "-Xjitcheckcg", "-Xjitverbose", "-Xjitprofile", "-Xjitdisableopt", "-Xjitsuspendpoll", "-XX:mainThreadStackSize=1337" }; diff --git a/cmdline/cmdline_types.h b/cmdline/cmdline_types.h index 04ea368..180baec 100644 --- a/cmdline/cmdline_types.h +++ b/cmdline/cmdline_types.h @@ -585,8 +585,6 @@ struct CmdlineType<LogVerbosity> : CmdlineTypeParser<LogVerbosity> { log_verbosity.heap = true; } else if (verbose_options[j] == "jdwp") { log_verbosity.jdwp = true; - } else if (verbose_options[j] == "jit") { - log_verbosity.jit = true; } else if (verbose_options[j] == "jni") { log_verbosity.jni = true; } else if (verbose_options[j] == "monitor") { |