commit 79db99711f6b27f6ced6b7ed52c827f5211010a9
author Scott Wakeling <scott.wakeling@linaro.org> Thu Jan 19 14:08:42 2017 +0000
committer Scott Wakeling <scott.wakeling@linaro.org> Fri Jan 27 10:17:44 2017 +0000
tree f153b68f97eaa8f71e87f5978b82112544af0acf
parent e36c51aee58e61e9fc89851b767379c587f050e3

ARM64: VIXL: Fix breaking changes to ternary operator with Register inputs.

Test: mma art
Change-Id: I33d1e05e47f337f1a9271b35dba9227057cda096

compiler/optimizing/common_arm64.h

diff --git a/compiler/optimizing/common_arm64.h b/compiler/optimizing/common_arm64.h
index 776a483..93ea090 100644
--- a/compiler/optimizing/common_arm64.h
+++ b/compiler/optimizing/common_arm64.h
@@ -130,8 +130,8 @@
   Primitive::Type input_type = input->GetType();
   if (input->IsConstant() && input->AsConstant()->IsZeroBitPattern()) {
     return (Primitive::ComponentSize(input_type) >= vixl::aarch64::kXRegSizeInBytes)
-        ? vixl::aarch64::xzr
-        : vixl::aarch64::wzr;
+        ? vixl::aarch64::Register(vixl::aarch64::xzr)
+        : vixl::aarch64::Register(vixl::aarch64::wzr);
   }
   return InputCPURegisterAt(instr, index);
 }