Merge "Fix braino in x64 assembler."

diff --cc compiler/utils/x86_64/assembler_x86_64.h
index 51d1de2,b331712..abf2561
--- 1/compiler/utils/x86_64/assembler_x86_64.h
--- 2/compiler/utils/x86_64/assembler_x86_64.h
+++ b/compiler/utils/x86_64/assembler_x86_64.h
@@@ -178,9 -178,9 +178,9 @@@ class Address : public Operand 
    }
  
    void Init(CpuRegister base_in, int32_t disp) {
-     if (disp == 0 && base_in.AsRegister() != RBP) {
+     if (disp == 0 && base_in.LowBits() != RBP) {
        SetModRM(0, base_in);
 -      if (base_in.LowBits() == RSP) {
 +      if (base_in.AsRegister() == RSP) {
          SetSIB(TIMES_1, CpuRegister(RSP), base_in);
        }
      } else if (disp >= -128 && disp <= 127) {

diff --cc compiler/utils/x86_64/assembler_x86_64_test.cc
Simple merge