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 /runtime/quick | |
| 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 'runtime/quick')
| -rw-r--r-- | runtime/quick/inline_method_analyser.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/runtime/quick/inline_method_analyser.cc b/runtime/quick/inline_method_analyser.cc index d65b2d5241..44e28443dd 100644 --- a/runtime/quick/inline_method_analyser.cc +++ b/runtime/quick/inline_method_analyser.cc @@ -77,7 +77,9 @@ bool InlineMethodAnalyser::AnalyseMethodCode(verifier::MethodVerifier* verifier, InlineMethod* method) { DCHECK(verifier != nullptr); DCHECK_EQ(Runtime::Current()->IsCompiler(), method != nullptr); - DCHECK_EQ(verifier->CanLoadClasses(), method != nullptr); + if (!Runtime::Current()->UseJit()) { + DCHECK_EQ(verifier->CanLoadClasses(), method != nullptr); + } // We currently support only plain return or 2-instruction methods. const DexFile::CodeItem* code_item = verifier->CodeItem(); @@ -110,6 +112,10 @@ bool InlineMethodAnalyser::AnalyseMethodCode(verifier::MethodVerifier* verifier, case Instruction::IGET_CHAR: case Instruction::IGET_SHORT: case Instruction::IGET_WIDE: + // TODO: Add handling for JIT. + // case Instruction::IGET_QUICK: + // case Instruction::IGET_WIDE_QUICK: + // case Instruction::IGET_OBJECT_QUICK: return AnalyseIGetMethod(verifier, method); case Instruction::IPUT: case Instruction::IPUT_OBJECT: @@ -118,6 +124,10 @@ bool InlineMethodAnalyser::AnalyseMethodCode(verifier::MethodVerifier* verifier, case Instruction::IPUT_CHAR: case Instruction::IPUT_SHORT: case Instruction::IPUT_WIDE: + // TODO: Add handling for JIT. + // case Instruction::IPUT_QUICK: + // case Instruction::IPUT_WIDE_QUICK: + // case Instruction::IPUT_OBJECT_QUICK: return AnalyseIPutMethod(verifier, method); default: return false; |