summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-04-16 23:24:24 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-16 23:24:25 +0000
commitf8bdd9f3a002970e4b8fdcf6fe6730116f1626c3 (patch)
tree0605ec617454d051485b649898b3e241553411f6
parent11c9cd45f2aadad5622fef4b3e81b9e2181ebae3 (diff)
parentf903680dd74e1f353dae0f4155163839a6386bf9 (diff)
downloadandroid_art-f8bdd9f3a002970e4b8fdcf6fe6730116f1626c3.tar.gz
android_art-f8bdd9f3a002970e4b8fdcf6fe6730116f1626c3.tar.bz2
android_art-f8bdd9f3a002970e4b8fdcf6fe6730116f1626c3.zip
Merge "Fix value used for shift in quick_cfi_test."
-rw-r--r--compiler/dex/quick/quick_cfi_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/quick/quick_cfi_test.cc b/compiler/dex/quick/quick_cfi_test.cc
index 2db5a366df..d276457d01 100644
--- a/compiler/dex/quick/quick_cfi_test.cc
+++ b/compiler/dex/quick/quick_cfi_test.cc
@@ -89,13 +89,13 @@ class QuickCFITest : public CFITest {
m2l->CompilerInitializeRegAlloc();
for (const auto& info : m2l->reg_pool_->core_regs_) {
if (m2l->num_core_spills_ < 2 && !info->IsTemp() && !info->InUse()) {
- m2l->core_spill_mask_ |= 1 << info->GetReg().GetReg();
+ m2l->core_spill_mask_ |= 1 << info->GetReg().GetRegNum();
m2l->num_core_spills_++;
}
}
for (const auto& info : m2l->reg_pool_->sp_regs_) {
if (m2l->num_fp_spills_ < 2 && !info->IsTemp() && !info->InUse()) {
- m2l->fp_spill_mask_ |= 1 << info->GetReg().GetReg();
+ m2l->fp_spill_mask_ |= 1 << info->GetReg().GetRegNum();
m2l->num_fp_spills_++;
}
}