diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 09:37:21 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 10:47:02 -0800 |
| commit | e5f13e57ff8fa36342beb33830b3ec5942a61cca (patch) | |
| tree | 02e370ecc4e0d955f28bfc71a41015f94fbb19b7 /compiler/dex/quick/quick_compiler.cc | |
| parent | 354d58ba776866ea7b1c71f0d0848d5aaa013ae3 (diff) | |
| download | art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.gz art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.bz2 art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.zip | |
Revert "Revert "Add JIT""
Added missing EntryPointToCodePointer.
This reverts commit a5ca888d715cd0c6c421313211caa1928be3e399.
Change-Id: Ia74df0ef3a7babbdcb0466fd24da28e304e3f5af
Diffstat (limited to 'compiler/dex/quick/quick_compiler.cc')
| -rw-r--r-- | compiler/dex/quick/quick_compiler.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/dex/quick/quick_compiler.cc b/compiler/dex/quick/quick_compiler.cc index 19c2a5a3a3..fcf4716c1a 100644 --- a/compiler/dex/quick/quick_compiler.cc +++ b/compiler/dex/quick/quick_compiler.cc @@ -542,6 +542,11 @@ bool QuickCompiler::CanCompileMethod(uint32_t method_idx, const DexFile& dex_fil void QuickCompiler::InitCompilationUnit(CompilationUnit& cu) const { // Disable optimizations according to instruction set. cu.disable_opt |= kDisabledOptimizationsPerISA[cu.instruction_set]; + if (Runtime::Current()->UseJit()) { + // Disable these optimizations for JIT until quickened byte codes are done being implemented. + // TODO: Find a cleaner way to do this. + cu.disable_opt |= 1u << kLocalValueNumbering; + } } void QuickCompiler::Init() { |