commit eeaf47f7c9bbad29afab84a0f199a5751d9c616b
author Ulyana Trafimovich <skvadrik@google.com> Wed Oct 28 15:59:29 2020 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 28 17:42:50 2020 +0000
tree 3b1572bd8c3cd89dbe060b52d1760bd857e999ed
parent 1f3612f93759823d630e117be5216f694e0702e9

Revert "ART: Fix breaking changes from recent VIXL update."

Revert submission 1331125-VIXL_UPDATE_SVE

Reason for revert: broken build git_master-art-host/art-gtest-heap-poisoning @ 6936943
Reverted Changes:
Ic10af84a0:Merge remote-tracking branch 'aosp/upstream-master...
I752a0b0ba:ART: Fix breaking changes from recent VIXL update....

Bug: 171879890
Change-Id: Idb0d5c2e88948d799a4ef2c828be2828ea2270ea

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 6cfe67b..5920a48 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -6901,11 +6901,11 @@
   switch (kind) {
     case BakerReadBarrierKind::kField:
     case BakerReadBarrierKind::kAcquire: {
-      Register base_reg =
-          vixl::aarch64::XRegister(BakerReadBarrierFirstRegField::Decode(encoded_data));
+      auto base_reg =
+          Register::GetXRegFromCode(BakerReadBarrierFirstRegField::Decode(encoded_data));
       CheckValidReg(base_reg.GetCode());
-      Register holder_reg =
-          vixl::aarch64::XRegister(BakerReadBarrierSecondRegField::Decode(encoded_data));
+      auto holder_reg =
+          Register::GetXRegFromCode(BakerReadBarrierSecondRegField::Decode(encoded_data));
       CheckValidReg(holder_reg.GetCode());
       UseScratchRegisterScope temps(assembler.GetVIXLAssembler());
       temps.Exclude(ip0, ip1);
@@ -6951,8 +6951,8 @@
       break;
     }
     case BakerReadBarrierKind::kArray: {
-      Register base_reg =
-          vixl::aarch64::XRegister(BakerReadBarrierFirstRegField::Decode(encoded_data));
+      auto base_reg =
+          Register::GetXRegFromCode(BakerReadBarrierFirstRegField::Decode(encoded_data));
       CheckValidReg(base_reg.GetCode());
       DCHECK_EQ(kBakerReadBarrierInvalidEncodedReg,
                 BakerReadBarrierSecondRegField::Decode(encoded_data));
@@ -6980,8 +6980,8 @@
       // and it does not have a forwarding address), call the correct introspection entrypoint;
       // otherwise return the reference (or the extracted forwarding address).
       // There is no gray bit check for GC roots.
-      Register root_reg =
-          vixl::aarch64::WRegister(BakerReadBarrierFirstRegField::Decode(encoded_data));
+      auto root_reg =
+          Register::GetWRegFromCode(BakerReadBarrierFirstRegField::Decode(encoded_data));
       CheckValidReg(root_reg.GetCode());
       DCHECK_EQ(kBakerReadBarrierInvalidEncodedReg,
                 BakerReadBarrierSecondRegField::Decode(encoded_data));