summaryrefslogtreecommitdiffstats
path: root/compiler/dex/quick
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2015-01-26 14:06:46 +0000
committerVladimir Marko <vmarko@google.com>2015-01-26 14:32:39 +0000
commit00ca84730a21578dcc6b47bd8e08b78ab9b2dded (patch)
tree5af68aefc28464ccb209fff525ab2fb374f1d236 /compiler/dex/quick
parent081d27817608c2ea035f2473c4ea1062a79bccef (diff)
downloadart-00ca84730a21578dcc6b47bd8e08b78ab9b2dded.zip
art-00ca84730a21578dcc6b47bd8e08b78ab9b2dded.tar.gz
art-00ca84730a21578dcc6b47bd8e08b78ab9b2dded.tar.bz2
Quick: Fix range check for intrinsic String.charAt() on x86.
Bug: 19125146 Change-Id: I274190a7a60cd2e29a854738ed1ec99a9e611969
Diffstat (limited to 'compiler/dex/quick')
-rwxr-xr-xcompiler/dex/quick/x86/target_x86.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/x86/target_x86.cc b/compiler/dex/quick/x86/target_x86.cc
index bfa24cc..a38efd3 100755
--- a/compiler/dex/quick/x86/target_x86.cc
+++ b/compiler/dex/quick/x86/target_x86.cc
@@ -2510,7 +2510,7 @@ bool X86Mir2Lir::GenInlinedCharAt(CallInfo* info) {
if (rl_idx.is_const) {
LIR* comparison;
range_check_branch = OpCmpMemImmBranch(
- kCondUlt, RegStorage::InvalidReg(), rl_obj.reg, count_offset,
+ kCondLs, RegStorage::InvalidReg(), rl_obj.reg, count_offset,
mir_graph_->ConstantValue(rl_idx.orig_sreg), nullptr, &comparison);
MarkPossibleNullPointerExceptionAfter(0, comparison);
} else {