diff options
| author | 2015-05-18 22:31:29 +0100 | |
|---|---|---|
| committer | 2015-05-29 14:15:04 +0100 | |
| commit | d23eeef3492b53102eb8093524cf37e2b4c296db (patch) | |
| tree | 57d3e9ab2853d5b8092568bb3d29bc850c113315 /compiler/optimizing/builder.cc | |
| parent | a15c78d3cc28f514a482ffd792a767e97fe53c95 (diff) | |
Support for inlining methods that call/throw.
Mostly fixes here and there to make it working.
Change-Id: I1b535e895105d78b65634636d675b818551f783e
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 f858f82a40..365599f904 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()); |