diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-23 18:32:13 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-23 18:32:13 +0100 |
| commit | 8d6ae524ed5d2fed1f9e789d6de9764d374afa43 (patch) | |
| tree | 3283f899900f19ecca8540b680755f44d5d70d1c /compiler | |
| parent | 46fdec13b6dcaf932aa9fb1338f32df01aa0d959 (diff) | |
| download | art-8d6ae524ed5d2fed1f9e789d6de9764d374afa43.zip art-8d6ae524ed5d2fed1f9e789d6de9764d374afa43.tar.gz art-8d6ae524ed5d2fed1f9e789d6de9764d374afa43.tar.bz2 | |
Fix wrong unsigned to signed conversions.
The HIntConstant node takes an int32_t, so we have to keep things signed.
Change-Id: Ib3fa50e87f99118d320cbb381f619d5be9287530
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/builder.cc | 14 | ||||
| -rw-r--r-- | compiler/optimizing/builder.h | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/compiler/optimizing/builder.cc b/compiler/optimizing/builder.cc index 0ab7782..e4dee46 100644 --- a/compiler/optimizing/builder.cc +++ b/compiler/optimizing/builder.cc @@ -550,7 +550,7 @@ void HGraphBuilder::BuildFillArrayData(HInstruction* object, } void HGraphBuilder::BuildFillWideArrayData(HInstruction* object, - const uint64_t* data, + const int64_t* data, uint32_t element_count, uint32_t dex_offset) { for (uint32_t i = 0; i < element_count; ++i) { @@ -964,25 +964,29 @@ bool HGraphBuilder::AnalyzeDexInstruction(const Instruction& instruction, uint32 switch (payload->element_width) { case 1: - BuildFillArrayData(null_check, data, element_count, Primitive::kPrimByte, dex_offset); + BuildFillArrayData(null_check, + reinterpret_cast<const int8_t*>(data), + element_count, + Primitive::kPrimByte, + dex_offset); break; case 2: BuildFillArrayData(null_check, - reinterpret_cast<const uint16_t*>(data), + reinterpret_cast<const int16_t*>(data), element_count, Primitive::kPrimShort, dex_offset); break; case 4: BuildFillArrayData(null_check, - reinterpret_cast<const uint32_t*>(data), + reinterpret_cast<const int32_t*>(data), element_count, Primitive::kPrimInt, dex_offset); break; case 8: BuildFillWideArrayData(null_check, - reinterpret_cast<const uint64_t*>(data), + reinterpret_cast<const int64_t*>(data), element_count, dex_offset); break; diff --git a/compiler/optimizing/builder.h b/compiler/optimizing/builder.h index c5e02db..b55ef07 100644 --- a/compiler/optimizing/builder.h +++ b/compiler/optimizing/builder.h @@ -154,7 +154,7 @@ class HGraphBuilder : public ValueObject { // Fills the given object with data as specified in the fill-array-data // instruction. The data must be for long and double arrays. void BuildFillWideArrayData(HInstruction* object, - const uint64_t* data, + const int64_t* data, uint32_t element_count, uint32_t dex_offset); |