diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-02-24 08:11:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-24 08:11:24 +0000 |
| commit | f548c54c69443ba94fcee89daca6f5f499d71e9a (patch) | |
| tree | aff0f707cb27e303d3b9de53f961bf48e38ad5be /cmdline | |
| parent | 9e87baff2eee8e8ae0700c7391ca4447dbe142b0 (diff) | |
| parent | a5ca888d715cd0c6c421313211caa1928be3e399 (diff) | |
| download | art-f548c54c69443ba94fcee89daca6f5f499d71e9a.zip art-f548c54c69443ba94fcee89daca6f5f499d71e9a.tar.gz art-f548c54c69443ba94fcee89daca6f5f499d71e9a.tar.bz2 | |
Merge "Revert "Add JIT""
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 18d8c7a..b740b41 100644 --- a/cmdline/cmdline_parser_test.cc +++ b/cmdline/cmdline_parser_test.cc @@ -411,26 +411,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) { @@ -515,8 +495,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") { |