ART: Fix breaking changes from recent VIXL update.

Also fixes the vixl-related headers includes.

Test: test-art-target, test-art-host

Change-Id: I752a0b0baf741aa2a0693253155042104c8b3b27

1 files changed, 4 insertions, 4 deletions

diff --git a/compiler/utils/arm64/assembler_arm64.h b/compiler/utils/arm64/assembler_arm64.h
index 232efd4917..5442b6a980 100644
--- a/compiler/utils/arm64/assembler_arm64.h
+++ b/compiler/utils/arm64/assembler_arm64.h
@@ -144,7 +144,7 @@ class Arm64Assembler final : public Assembler {
     } else if (code == XZR) {
       return vixl::aarch64::xzr;
     }
-    return vixl::aarch64::Register::GetXRegFromCode(code);
+    return vixl::aarch64::XRegister(code);
   }
 
   static vixl::aarch64::Register reg_w(int code) {
@@ -154,15 +154,15 @@ class Arm64Assembler final : public Assembler {
     } else if (code == WZR) {
       return vixl::aarch64::wzr;
     }
-    return vixl::aarch64::Register::GetWRegFromCode(code);
+    return vixl::aarch64::WRegister(code);
   }
 
   static vixl::aarch64::VRegister reg_d(int code) {
-    return vixl::aarch64::VRegister::GetDRegFromCode(code);
+    return vixl::aarch64::DRegister(code);
   }
 
   static vixl::aarch64::VRegister reg_s(int code) {
-    return vixl::aarch64::VRegister::GetSRegFromCode(code);
+    return vixl::aarch64::SRegister(code);
   }
 
  private: