summaryrefslogtreecommitdiff
path: root/compiler/optimizing/code_generator_mips.cc
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2017-10-19 09:21:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-19 09:21:21 +0000
commitb277aa1385f7f4593c9978d8106669142d158f4f (patch)
tree02b4919913ca6193db721f486062b949efb1fbfc /compiler/optimizing/code_generator_mips.cc
parentdfce43569a32ed7da881796713647cd8051d0d4e (diff)
parent61b922847403ac0e74b6477114c81a28ac2e01a0 (diff)
Merge "ART: Introduce Uint8 loads in compiled code."
Diffstat (limited to 'compiler/optimizing/code_generator_mips.cc')
-rw-r--r--compiler/optimizing/code_generator_mips.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc
index 56df6b5289..9d0826f193 100644
--- a/compiler/optimizing/code_generator_mips.cc
+++ b/compiler/optimizing/code_generator_mips.cc
@@ -6205,7 +6205,8 @@ void LocationsBuilderMIPS::HandleFieldGet(HInstruction* instruction, const Field
void InstructionCodeGeneratorMIPS::HandleFieldGet(HInstruction* instruction,
const FieldInfo& field_info,
uint32_t dex_pc) {
- DataType::Type type = field_info.GetFieldType();
+ DCHECK_EQ(DataType::Size(field_info.GetFieldType()), DataType::Size(instruction->GetType()));
+ DataType::Type type = instruction->GetType();
LocationSummary* locations = instruction->GetLocations();
Location obj_loc = locations->InAt(0);
Register obj = obj_loc.AsRegister<Register>();