summaryrefslogtreecommitdiff
path: root/compiler/optimizing/builder.cc
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2014-11-06 19:21:56 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-06 19:21:56 +0000
commit17fdb57a7c2c88bbf466c132c45724bfe39f0da7 (patch)
tree52791979f57c2734f7d39a0ec2693b10e6eee3b6 /compiler/optimizing/builder.cc
parentbe69818b301c31a0a7f5bf6aebdc54020f77a85e (diff)
parentbeb96e7eeffcb2964f9bba9b1428d60befedaf37 (diff)
am beb96e7e: Merge "Fixed BuildCheckedDiv signature"
* commit 'beb96e7eeffcb2964f9bba9b1428d60befedaf37': Fixed BuildCheckedDiv signature
Diffstat (limited to 'compiler/optimizing/builder.cc')
-rw-r--r--compiler/optimizing/builder.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc
index a31ea29ae1..64fb764937 100644
--- a/compiler/optimizing/builder.cc
+++ b/compiler/optimizing/builder.cc
@@ -547,7 +547,7 @@ bool HGraphBuilder::BuildStaticFieldAccess(const Instruction& instruction,
void HGraphBuilder::BuildCheckedDiv(uint16_t out_reg,
uint16_t first_reg,
- uint16_t second_reg,
+ int32_t second_reg,
uint32_t dex_offset,
Primitive::Type type,
bool second_is_lit) {