Quick compiler: x86_64 workaround
A recent CL changed the allocation of temp registers destined to
hold a reference such that on 64-bit systems a 64-bit register
would be allocated. However, for bring-up purposes, the x86_64
backend wants the ability to continue holding long values in a
register pair.
Change-Id: I25d9f755fafbe96144226677f85c6d5cad1ffa76
diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc
index 59ae16e..058b89c 100644
--- a/compiler/dex/quick/ralloc_util.cc
+++ b/compiler/dex/quick/ralloc_util.cc
@@ -407,7 +407,16 @@
}
RegStorage Mir2Lir::AllocTempWord() {
- return (Is64BitInstructionSet(cu_->instruction_set)) ? AllocTempWide() : AllocTemp();
+ // FIXME: temporary workaround. For bring-up purposes, x86_64 needs the ability
+ // to allocate wide values as a pair of core registers. However, we can't hold
+ // a reference in a register pair. This workaround will be removed when the
+ // reference handling code is reworked, or x86_64 backend starts using wide core
+ // registers - whichever happens first.
+ if (cu_->instruction_set == kX86_64) {
+ return AllocTemp();
+ } else {
+ return (Is64BitInstructionSet(cu_->instruction_set)) ? AllocTempWide() : AllocTemp();
+ }
}
RegStorage Mir2Lir::AllocTempSingle() {
