commit adbb4a746d2d90dd2920a8e0b7cd2397e93d17b9
author Vincent Belliard <vincent.belliard@arm.com> Tue Nov 22 14:24:54 2016 -0800
committer Vincent Belliard <vincent.belliard@arm.com> Mon Nov 28 20:50:40 2016 +0000
tree 8a8aeb0aa5f6cc90aaeb3f1085dd73c670fa18d1
parent 7d0ad8b7de47bd31742317523a5d764cdd58a466

Remove inheritance of Register for RegisterOrAPSR_nzcv.

Change-Id: Ie4baa104e243dc96bdf9f7d859597487ca62413b

src/aarch32/macro-assembler-aarch32.h

diff --git a/src/aarch32/macro-assembler-aarch32.h b/src/aarch32/macro-assembler-aarch32.h
index 5f6bf04..223a375 100644
--- a/src/aarch32/macro-assembler-aarch32.h
+++ b/src/aarch32/macro-assembler-aarch32.h
@@ -498,6 +498,11 @@
     return GetScratchRegisterList()->Includes(reg);
   }
 
+  bool AliasesAvailableScratchRegister(RegisterOrAPSR_nzcv reg) {
+    if (reg.IsAPSR_nzcv()) return false;
+    return GetScratchRegisterList()->Includes(reg.AsRegister());
+  }
+
   bool AliasesAvailableScratchRegister(VRegister reg) {
     return GetScratchVRegisterList()->IncludesAliasOf(reg);
   }