Add GetScratchVRegisterList to help ART to move to new API am: 6e8dbfe523 am: 2e0f226b26 am: 84d9a757eb

am: 073a78f50b

Change-Id: Ic4693cc1af581312e5eb2c63785a032a19a0d442

1 files changed, 9 insertions, 0 deletions

diff --git a/src/aarch64/macro-assembler-aarch64.h b/src/aarch64/macro-assembler-aarch64.h
index 88ed5577..cb85b73e 100644
--- a/src/aarch64/macro-assembler-aarch64.h
+++ b/src/aarch64/macro-assembler-aarch64.h
@@ -3379,6 +3379,15 @@ class MacroAssembler : public Assembler, public MacroAssemblerInterface {
     return GetScratchFPRegisterList();
   }
 
+  // FIXME: In the latest upstream VIXL GetScratchFPRegisterList gets replaced with
+  // GetScratchVRegisterList and is not available any more. This causes issues to move ART to the
+  // new API.
+  // The current version of GetScratchVRegisterList is temporary till the ART is moved to the new
+  // VIXL API and the upstream version of GetScratchVRegisterList is being integrated.
+  CPURegList* GetScratchVRegisterList() {
+    return GetScratchFPRegisterList();
+  }
+
   // Get or set the current (most-deeply-nested) UseScratchRegisterScope.
   void SetCurrentScratchRegisterScope(UseScratchRegisterScope* scope) {
     current_scratch_scope_ = scope;