summaryrefslogtreecommitdiff
path: root/compiler/optimizing/inliner.cc
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2015-04-25 03:44:50 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-25 03:44:50 +0000
commit4c9dd79c58353ca6612eb352bea2656c0c5bc1d7 (patch)
treec62ba17fb96bdd15dd61b0193c5047c91015e0b6 /compiler/optimizing/inliner.cc
parente08556a2c9416f2f6cfdac4497c10aa98c09673a (diff)
parent940c65d6757130d2e9f864d4c2220838f0312bea (diff)
am 940c65d6: Merge "[optimizing] Rename HasArrayAccesses and check it"
* commit '940c65d6757130d2e9f864d4c2220838f0312bea': [optimizing] Rename HasArrayAccesses and check it
Diffstat (limited to 'compiler/optimizing/inliner.cc')
-rw-r--r--compiler/optimizing/inliner.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 37b57533c1..ada32db047 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -268,8 +268,8 @@ bool HInliner::TryBuildAndInline(Handle<mirror::ArtMethod> resolved_method,
callee_graph->InlineInto(graph_, invoke_instruction);
- if (callee_graph->HasArrayAccesses()) {
- graph_->SetHasArrayAccesses(true);
+ if (callee_graph->HasBoundsChecks()) {
+ graph_->SetHasBoundsChecks(true);
}
return true;