From e5f13e57ff8fa36342beb33830b3ec5942a61cca Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 24 Feb 2015 09:37:21 -0800 Subject: Revert "Revert "Add JIT"" Added missing EntryPointToCodePointer. This reverts commit a5ca888d715cd0c6c421313211caa1928be3e399. Change-Id: Ia74df0ef3a7babbdcb0466fd24da28e304e3f5af --- compiler/dex/quick/quick_compiler.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'compiler/dex/quick/quick_compiler.cc') 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() { -- cgit v1.2.3-59-g8ed1b