diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-02-24 08:10:57 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-02-24 08:10:57 +0000 |
| commit | a5ca888d715cd0c6c421313211caa1928be3e399 (patch) | |
| tree | bdb08a2cbcf277ab7f02626a23b52a3fdf272ffe /compiler/dex/mir_graph.cc | |
| parent | 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4 (diff) | |
| download | art-a5ca888d715cd0c6c421313211caa1928be3e399.tar.gz art-a5ca888d715cd0c6c421313211caa1928be3e399.tar.bz2 art-a5ca888d715cd0c6c421313211caa1928be3e399.zip | |
Revert "Add JIT"
Sorry, run-test crashes on target:
0-05 12:15:51.633 I/DEBUG (27995): Abort message: 'art/runtime/mirror/art_method.cc:349] Check failed: PcIsWithinQuickCode(reinterpret_cast<uintptr_t>(code), pc) java.lang.Throwable java.lang.Throwable.fillInStackTrace() pc=71e3366b code=0x71e3362d size=ad000000'
10-05 12:15:51.633 I/DEBUG (27995): r0 00000000 r1 0000542b r2 00000006 r3 00000000
10-05 12:15:51.633 I/DEBUG (27995): r4 00000006 r5 b6f9addc r6 00000002 r7 0000010c
10-05 12:15:51.633 I/DEBUG (27995): r8 b63fe1e8 r9 be8e1418 sl b6427400 fp b63fcce0
10-05 12:15:51.633 I/DEBUG (27995): ip 0000542b sp be8e1358 lr b6e9a27b pc b6e9c280 cpsr 40070010
10-05 12:15:51.633 I/DEBUG (27995):
Bug: 17950037
This reverts commit 2535abe7d1fcdd0e6aca782b1f1932a703ed50a4.
Change-Id: I6f88849bc6f2befed0c0aaa0b7b2a08c967a83c3
Diffstat (limited to 'compiler/dex/mir_graph.cc')
| -rw-r--r-- | compiler/dex/mir_graph.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/compiler/dex/mir_graph.cc b/compiler/dex/mir_graph.cc index f354a49111..76b5e44df0 100644 --- a/compiler/dex/mir_graph.cc +++ b/compiler/dex/mir_graph.cc @@ -1673,6 +1673,12 @@ void MIRGraph::GetBlockName(BasicBlock* bb, char* name) { } } +const char* MIRGraph::GetShortyFromTargetIdx(int target_idx) { + // TODO: for inlining support, use current code unit. + const DexFile::MethodId& method_id = cu_->dex_file->GetMethodId(target_idx); + return cu_->dex_file->GetShorty(method_id.proto_idx_); +} + const char* MIRGraph::GetShortyFromMethodReference(const MethodReference& target_method) { const DexFile::MethodId& method_id = target_method.dex_file->GetMethodId(target_method.dex_method_index); @@ -1718,7 +1724,8 @@ void MIRGraph::DumpMIRGraph() { * high-word loc for wide arguments. Also pull up any following * MOVE_RESULT and incorporate it into the invoke. */ -CallInfo* MIRGraph::NewMemCallInfo(BasicBlock* bb, MIR* mir, InvokeType type, bool is_range) { +CallInfo* MIRGraph::NewMemCallInfo(BasicBlock* bb, MIR* mir, InvokeType type, + bool is_range) { CallInfo* info = static_cast<CallInfo*>(arena_->Alloc(sizeof(CallInfo), kArenaAllocMisc)); MIR* move_result_mir = FindMoveResult(bb, mir); @@ -1737,13 +1744,6 @@ CallInfo* MIRGraph::NewMemCallInfo(BasicBlock* bb, MIR* mir, InvokeType type, bo info->opt_flags = mir->optimization_flags; info->type = type; info->is_range = is_range; - if (IsInstructionQuickInvoke(mir->dalvikInsn.opcode)) { - const auto& method_info = GetMethodLoweringInfo(mir); - info->method_ref = method_info.GetTargetMethod(); - } else { - info->method_ref = MethodReference(GetCurrentDexCompilationUnit()->GetDexFile(), - mir->dalvikInsn.vB); - } info->index = mir->dalvikInsn.vB; info->offset = mir->offset; info->mir = mir; |