There is a cyclic dependency between MC and Target if this method is out-of-line.

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

diff --git a/include/llvm/Target/TargetAsmInfo.h b/include/llvm/Target/TargetAsmInfo.h
index 44f23ad11ae406d040e6ec94b4524f772612a544..96e085d7bb74e29f5954fdfeb9e04998c044a8f6 100644 (file)
--- a/include/llvm/Target/TargetAsmInfo.h
+++ b/include/llvm/Target/TargetAsmInfo.h
@@ -86,7 +86,10 @@ public:
   }
 
   int getCompactUnwindEncoding(ArrayRef<MCCFIInstruction> Instrs,
-                               int DataAlignmentFactor, bool IsEH) const;
+                               int DataAlignmentFactor,
+                               bool IsEH) const {
+    return TFI->getCompactUnwindEncoding(Instrs, DataAlignmentFactor, IsEH);
+  }
 
   const unsigned *getCalleeSavedRegs(MachineFunction *MF = 0) const {
     return TRI->getCalleeSavedRegs(MF);

diff --git a/lib/Target/TargetAsmInfo.cpp b/lib/Target/TargetAsmInfo.cpp
index 1d57d8498e6625f7de4d0864d110b3a6fba1cfbb..475a942da059540a45418584f0760e1e328f88fc 100644 (file)
--- a/lib/Target/TargetAsmInfo.cpp
+++ b/lib/Target/TargetAsmInfo.cpp
@@ -26,9 +26,3 @@ TargetAsmInfo::TargetAsmInfo(const TargetMachine &TM) {
   TRI = TM.getRegisterInfo();
   TFI->getInitialFrameState(InitialFrameState);
 }
-
-int TargetAsmInfo::getCompactUnwindEncoding(ArrayRef<MCCFIInstruction> Instrs,
-                                            int DataAlignmentFactor,
-                                            bool IsEH) const {
-  return TFI->getCompactUnwindEncoding(Instrs, DataAlignmentFactor, IsEH);
-}