summaryrefslogtreecommitdiffstats
path: root/compiler/dex
diff options
context:
space:
mode:
authorJeff Hao <jeffhao@google.com>2014-04-01 14:58:49 -0700
committerJeff Hao <jeffhao@google.com>2014-04-02 17:18:13 -0700
commit4a200f56b7075309316b04d550c9cc50f8314edd (patch)
tree0c01f484239203eeeb9f8e5f97300bca09b051ad /compiler/dex
parentd0ab1223cc8c5181e502196a7765790ad2aba3c8 (diff)
downloadart-4a200f56b7075309316b04d550c9cc50f8314edd.zip
art-4a200f56b7075309316b04d550c9cc50f8314edd.tar.gz
art-4a200f56b7075309316b04d550c9cc50f8314edd.tar.bz2
Add support for -Xverify:none mode.
This mode skips all verification and compilation. Public bug: https://code.google.com/p/android/issues/detail?id=67664 Change-Id: Idd00ab8e9e46d129c02988b063c41a507e07bf5b
Diffstat (limited to 'compiler/dex')
-rw-r--r--compiler/dex/frontend.cc10
-rw-r--r--compiler/dex/mir_analysis.cc2
2 files changed, 4 insertions, 8 deletions
diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc
index 3f122de..cc616f6 100644
--- a/compiler/dex/frontend.cc
+++ b/compiler/dex/frontend.cc
@@ -145,9 +145,7 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver,
return NULL;
}
- const CompilerOptions& compiler_options = driver.GetCompilerOptions();
- CompilerOptions::CompilerFilter compiler_filter = compiler_options.GetCompilerFilter();
- if (compiler_filter == CompilerOptions::kInterpretOnly) {
+ if (!driver.GetCompilerOptions().IsCompilationEnabled()) {
return nullptr;
}
@@ -230,10 +228,8 @@ static CompiledMethod* CompileMethod(CompilerDriver& driver,
class_loader, dex_file);
cu.NewTimingSplit("MIROpt:CheckFilters");
- if (compiler_filter != CompilerOptions::kInterpretOnly) {
- if (cu.mir_graph->SkipCompilation()) {
- return NULL;
- }
+ if (cu.mir_graph->SkipCompilation()) {
+ return NULL;
}
/* Create the pass driver and launch it */
diff --git a/compiler/dex/mir_analysis.cc b/compiler/dex/mir_analysis.cc
index b96c40d..200795e 100644
--- a/compiler/dex/mir_analysis.cc
+++ b/compiler/dex/mir_analysis.cc
@@ -1013,7 +1013,7 @@ bool MIRGraph::SkipCompilation() {
return true;
}
- if (compiler_filter == CompilerOptions::kInterpretOnly || compiler_filter == CompilerOptions::kProfiled) {
+ if (!compiler_options.IsCompilationEnabled() || compiler_filter == CompilerOptions::kProfiled) {
return true;
}