diff options
| author | buzbee <buzbee@google.com> | 2014-04-28 12:33:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-28 12:33:58 +0000 |
| commit | 0f73e2ee44977b9b5cfe42f6c4c3b6a407e92368 (patch) | |
| tree | 0a63c9e741ff9991ea150775f9dffbe77019d2d0 | |
| parent | 6d2387765ed0a898281d126bc3d4f9b124667d5d (diff) | |
| parent | fd698e67953e40e804d7c9d1a3e8460e9d67382a (diff) | |
| download | art-0f73e2ee44977b9b5cfe42f6c4c3b6a407e92368.zip art-0f73e2ee44977b9b5cfe42f6c4c3b6a407e92368.tar.gz art-0f73e2ee44977b9b5cfe42f6c4c3b6a407e92368.tar.bz2 | |
Merge "Quick compiler: fix DCHECKS"
| -rw-r--r-- | compiler/dex/quick/arm/utility_arm.cc | 4 | ||||
| -rw-r--r-- | compiler/dex/quick/mips/utility_mips.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/compiler/dex/quick/arm/utility_arm.cc b/compiler/dex/quick/arm/utility_arm.cc index 6879ffc..2e64f74 100644 --- a/compiler/dex/quick/arm/utility_arm.cc +++ b/compiler/dex/quick/arm/utility_arm.cc @@ -699,7 +699,7 @@ LIR* ArmMir2Lir::LoadBaseIndexed(RegStorage r_base, RegStorage r_index, RegStora if (ARM_FPREG(r_dest.GetReg())) { if (ARM_SINGLEREG(r_dest.GetReg())) { - DCHECK((size == k32) || (size == kSingle)); + DCHECK((size == k32) || (size == kSingle) || (size == kReference)); opcode = kThumb2Vldrs; size = kSingle; } else { @@ -767,7 +767,7 @@ LIR* ArmMir2Lir::StoreBaseIndexed(RegStorage r_base, RegStorage r_index, RegStor if (ARM_FPREG(r_src.GetReg())) { if (ARM_SINGLEREG(r_src.GetReg())) { - DCHECK((size == k32) || (size == kSingle)); + DCHECK((size == k32) || (size == kSingle) || (size == kReference)); opcode = kThumb2Vstrs; size = kSingle; } else { diff --git a/compiler/dex/quick/mips/utility_mips.cc b/compiler/dex/quick/mips/utility_mips.cc index 12775e1..a865430 100644 --- a/compiler/dex/quick/mips/utility_mips.cc +++ b/compiler/dex/quick/mips/utility_mips.cc @@ -357,7 +357,7 @@ LIR* MipsMir2Lir::LoadBaseIndexed(RegStorage r_base, RegStorage r_index, RegStor if (MIPS_FPREG(r_dest.GetReg())) { DCHECK(MIPS_SINGLEREG(r_dest.GetReg())); - DCHECK((size == k32) || (size == kSingle)); + DCHECK((size == k32) || (size == kSingle) || (size == kReference)); size = kSingle; } else { if (size == kSingle) @@ -409,7 +409,7 @@ LIR* MipsMir2Lir::StoreBaseIndexed(RegStorage r_base, RegStorage r_index, RegSto if (MIPS_FPREG(r_src.GetReg())) { DCHECK(MIPS_SINGLEREG(r_src.GetReg())); - DCHECK((size == k32) || (size == kSingle)); + DCHECK((size == k32) || (size == kSingle) || (size == kReference)); size = kSingle; } else { if (size == kSingle) |