diff options
| author | 2016-02-05 17:25:17 +0000 | |
|---|---|---|
| committer | 2016-02-05 17:25:17 +0000 | |
| commit | 9fba3f67a0792ad5eeb495e489d11a87211c318f (patch) | |
| tree | 7204ab0951b14fa2536fe33d974e413a3cbe87a5 /compiler/optimizing/inliner.cc | |
| parent | 0f638c64686c03256c949051331b0838c9888a2a (diff) | |
| parent | b331febbab8e916680faba722cc84b66b84218a3 (diff) | |
Merge "Revert "Revert "Implement on-stack replacement for arm/arm64/x86/x86_64."""
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 9b91b53813..a8841d31c5 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -758,6 +758,7 @@ bool HInliner::TryBuildAndInline(ArtMethod* resolved_method, compiler_driver_->GetInstructionSet(), invoke_type, graph_->IsDebuggable(), + /* osr */ false, graph_->GetCurrentInstructionId()); callee_graph->SetArtMethod(resolved_method); |