diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 01:29:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-02-24 01:29:47 +0000 |
| commit | 4fa1a274024067e160a60d0a77124e95dca980e1 (patch) | |
| tree | 61dd41429b6b2ed29239f0c619c0e7ea058fd4ac /compiler/dex/quick/quick_compiler.cc | |
| parent | 40c99de1fd26f9ba6fae20a01175240b96fc7443 (diff) | |
| parent | 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4 (diff) | |
| download | android_art-4fa1a274024067e160a60d0a77124e95dca980e1.tar.gz android_art-4fa1a274024067e160a60d0a77124e95dca980e1.tar.bz2 android_art-4fa1a274024067e160a60d0a77124e95dca980e1.zip | |
Merge "Add JIT"
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() { |