diff options
| author | 2018-08-28 08:42:37 +0000 | |
|---|---|---|
| committer | 2018-08-28 08:42:37 +0000 | |
| commit | 19379b58bd433da91230e4fe6cd96e7416d16adc (patch) | |
| tree | 8ed63cf734578fdfb275363d6970c82b24538e7b /runtime | |
| parent | 56f64eb28b6f2c590031ca34b41ccc84bd7bf6e7 (diff) | |
| parent | a5ca8ebef24e38348213cef31417a4ccc7c3dd1a (diff) | |
Merge "Default to usejit:true."
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/parsed_options.cc | 9 | ||||
| -rw-r--r-- | runtime/runtime_options.def | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc index a44e5a4b54..0d98d90f1e 100644 --- a/runtime/parsed_options.cc +++ b/runtime/parsed_options.cc @@ -518,9 +518,12 @@ bool ParsedOptions::DoParse(const RuntimeOptions& options, LOG(INFO) << "setting boot class path to " << *args.Get(M::BootClassPath); } - if (args.GetOrDefault(M::UseJitCompilation) && args.GetOrDefault(M::Interpret)) { - Usage("-Xusejit:true and -Xint cannot be specified together"); - Exit(0); + if (args.GetOrDefault(M::Interpret)) { + if (args.Exists(M::UseJitCompilation) && *args.Get(M::UseJitCompilation)) { + Usage("-Xusejit:true and -Xint cannot be specified together\n"); + Exit(0); + } + args.Set(M::UseJitCompilation, false); } // Set a default boot class path if we didn't get an explicit one via command line. diff --git a/runtime/runtime_options.def b/runtime/runtime_options.def index ef21f9f9e0..5e12bbce05 100644 --- a/runtime/runtime_options.def +++ b/runtime/runtime_options.def @@ -69,7 +69,7 @@ RUNTIME_OPTIONS_KEY (Unit, IgnoreMaxFootprint) RUNTIME_OPTIONS_KEY (Unit, LowMemoryMode) RUNTIME_OPTIONS_KEY (bool, UseTLAB, (kUseTlab || kUseReadBarrier)) RUNTIME_OPTIONS_KEY (bool, EnableHSpaceCompactForOOM, true) -RUNTIME_OPTIONS_KEY (bool, UseJitCompilation, false) +RUNTIME_OPTIONS_KEY (bool, UseJitCompilation, true) RUNTIME_OPTIONS_KEY (bool, DumpNativeStackOnSigQuit, true) RUNTIME_OPTIONS_KEY (bool, MadviseRandomAccess, false) RUNTIME_OPTIONS_KEY (unsigned int, JITCompileThreshold) |