diff options
| author | 2015-05-29 14:03:10 +0000 | |
|---|---|---|
| committer | 2015-05-29 14:03:10 +0000 | |
| commit | 66a7d7a4612b0dfb8a409fbf05bbefd07122fd80 (patch) | |
| tree | cb9d448af1b932c52c8017b53e70b7243c3093d8 /compiler/optimizing/builder.cc | |
| parent | bd699ea018d12b061282f17a6abf329590ab263c (diff) | |
| parent | d23eeef3492b53102eb8093524cf37e2b4c296db (diff) | |
Merge "Support for inlining methods that call/throw."
Diffstat (limited to 'compiler/optimizing/builder.cc')
| -rw-r--r-- | compiler/optimizing/builder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index a17b578e4c..411a5aa3ba 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -652,8 +652,8 @@ bool HGraphBuilder::BuildInvoke(const Instruction& instruction, DCHECK((optimized_invoke_type == invoke_type) || (optimized_invoke_type != kDirect) || compiler_driver_->GetCompilerOptions().GetCompilePic()); bool is_recursive = - (target_method.dex_method_index == dex_compilation_unit_->GetDexMethodIndex()); - DCHECK(!is_recursive || (target_method.dex_file == dex_compilation_unit_->GetDexFile())); + (target_method.dex_method_index == outer_compilation_unit_->GetDexMethodIndex()) + && (target_method.dex_file == outer_compilation_unit_->GetDexFile()); if (optimized_invoke_type == kStatic) { ScopedObjectAccess soa(Thread::Current()); |