Constify getCompactUnwindRegNum.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@134527 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 1a417a11592807a357a3162039c8071ee88233ec..9beff25bcfebd39362697584e8f2f68b27b1b162 100644 (file)
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -107,8 +107,8 @@ public:
     return TRI->getSEHRegNum(RegNum);
   }
 
-  int getCompactUnwindRegNum(unsigned RegNum) const {
-    return TRI->getCompactUnwindRegNum(RegNum);
+  int getCompactUnwindRegNum(unsigned RegNum, bool isEH) const {
+    return TRI->getCompactUnwindRegNum(RegNum, isEH);
   }
 };
 

diff --git a/include/llvm/Target/TargetRegisterInfo.h b/include/llvm/Target/TargetRegisterInfo.h
index 3f28f6cd315f604fa5b842e747511b73c6f16101..8d827f117bad87eb482287359ef7f84112f48ee4 100644 (file)
--- a/include/llvm/Target/TargetRegisterInfo.h
+++ b/include/llvm/Target/TargetRegisterInfo.h
@@ -723,7 +723,7 @@ public:
 
   /// getCompactUnwindRegNum - This function maps the register to the number for
   /// compact unwind encoding. Return -1 if the register isn't valid.
-  virtual int getCompactUnwindRegNum(unsigned) const {
+  virtual int getCompactUnwindRegNum(unsigned, bool) const {
     return -1;
   }
 };

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index d32b8225f8e826ee647c2bc2d409104ef894d96c..3d65faa00699e1936e88993d97e5de83ebaa49ce 100644 (file)
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -107,8 +107,8 @@ int X86RegisterInfo::getLLVMRegNum(unsigned DwarfRegNo, bool isEH) const {
 
 /// getCompactUnwindRegNum - This function maps the register to the number for
 /// compact unwind encoding. Return -1 if the register isn't valid.
-int X86RegisterInfo::getCompactUnwindRegNum(unsigned RegNum) const {
-  switch (RegNum) {
+int X86RegisterInfo::getCompactUnwindRegNum(unsigned RegNum, bool isEH) const {
+  switch (getLLVMRegNum(RegNum, isEH)) {
   case X86::EBX: case X86::RBX: return 1;
   case X86::ECX: case X86::R12: return 2;
   case X86::EDX: case X86::R13: return 3;

diff --git a/lib/Target/X86/X86RegisterInfo.h b/lib/Target/X86/X86RegisterInfo.h
index a09c7eeed828a66b7e8c63ea534c53374bb08183..a12eb1297f7e17c03354fd4fcd53988bed554a3c 100644 (file)
--- a/lib/Target/X86/X86RegisterInfo.h
+++ b/lib/Target/X86/X86RegisterInfo.h
@@ -83,7 +83,7 @@ public:
 
   /// getCompactUnwindRegNum - This function maps the register to the number for
   /// compact unwind encoding. Return -1 if the register isn't valid.
-  int getCompactUnwindRegNum(unsigned RegNum) const;
+  int getCompactUnwindRegNum(unsigned RegNum, bool isEH) const;
 
   /// Code Generation virtual methods...
   ///