Remove a bit more cruft from the sjlj moving to a backend pass.

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

diff --git a/docs/ExceptionHandling.html b/docs/ExceptionHandling.html
index 9eb868f49296c857f4d5b6afd6bd0528c9e487cb..f67954f7e2b17b5bb5777cfb04b760c2ed44f259 100644 (file)
--- a/docs/ExceptionHandling.html
+++ b/docs/ExceptionHandling.html
@@ -38,7 +38,6 @@
        <li><a href="#llvm_eh_sjlj_setjmp"><tt>llvm.eh.sjlj.setjmp</tt></a></li>
        <li><a href="#llvm_eh_sjlj_longjmp"><tt>llvm.eh.sjlj.longjmp</tt></a></li>
        <li><a href="#llvm_eh_sjlj_lsda"><tt>llvm.eh.sjlj.lsda</tt></a></li>
-       <li><a href="#llvm_eh_sjlj_callsite"><tt>llvm.eh.sjlj.callsite</tt></a></li>
   </ol></li>
   <li><a href="#asm">Asm Table Formats</a>
   <ol>
@@ -471,24 +470,6 @@
 
 </div>
 
-<!-- ======================================================================= -->
-<div class="doc_subsubsection">
-  <a name="llvm_eh_sjlj_callsite">llvm.eh.sjlj.callsite</a>
-</div>
-
-<div class="doc_text">
-
-<pre>
-  void %<a href="#llvm_eh_sjlj_callsite">llvm.eh.sjlj.callsite</a>(i32)
-</pre>
-
-<p>The SJLJ front-end allocates call site indices for invoke instrucitons.
-   These values are passed to the back-end via the
-   <a href="#llvm_eh_sjlj_callsite"><tt>llvm.eh.sjlj.callsite</tt></a>
-   intrinsic, where they are used to build the LSDA call-site table.</p>
-
-</div>
-
 <!-- ======================================================================= -->
 <div class="doc_section">
   <a name="asm">Asm Table Formats</a>

diff --git a/include/llvm/CodeGen/MachineFunction.h b/include/llvm/CodeGen/MachineFunction.h
index f30cb821c1a34256be31604db12111fe87b1319b..0d15a95979137a55f8fa6dafebeaeb0d426a4eab 100644 (file)
--- a/include/llvm/CodeGen/MachineFunction.h
+++ b/include/llvm/CodeGen/MachineFunction.h
@@ -115,15 +115,6 @@ class MachineFunction {
   // The alignment of the function.
   unsigned Alignment;
 
-  // The currently active call_site value
-  unsigned CallSiteIndex;
-
-  // The largest call_site value encountered
-  unsigned MaxCallSiteIndex;
-
-  // Call sites mapped to corresponding landing pads
-  std::map<MachineBasicBlock*, unsigned> LandingPadCallSiteIndexMap;
-
 public:
   MachineFunction(Function *Fn, const TargetMachine &TM);
   ~MachineFunction();
@@ -169,41 +160,6 @@ public:
   ///
   void setAlignment(unsigned A) { Alignment = A; }
 
-  /// getCallSiteIndex() - Get the current call site index
-  ///
-  unsigned getCallSiteIndex() { return CallSiteIndex; }
-
-  /// setCallSiteIndex() - Set the current call site index
-  ///
-  void setCallSiteIndex(unsigned Idx) {
-    CallSiteIndex = Idx;
-    if (CallSiteIndex > MaxCallSiteIndex)
-      MaxCallSiteIndex = CallSiteIndex;
-  }
-
-  /// getMaxCallSiteIndex() - Get the largest call site index issued
-  ///
-  unsigned getMaxCallSiteIndex() { return MaxCallSiteIndex; }
-
-  /// setCallSiteIndexLandingPad() - Map the call site to a landing pad
-  ///
-  void setLandingPadCallSiteIndex(MachineBasicBlock *LandingPad,
-                                  unsigned CallSite) {
-    LandingPadCallSiteIndexMap[LandingPad] = CallSite;
-  }
-
-  /// getCallSiteIndexLandingPad() - Get landing pad for the call site index
-  ///
-  unsigned getLandingPadCallSiteIndex(MachineBasicBlock *LandingPad) {
-    return LandingPadCallSiteIndexMap[LandingPad];
-  }
-
-  /// getCallSiteCount() - Get the count of call site entries
-  ///
-  unsigned getCallSiteCount() {
-    return LandingPadCallSiteIndexMap.size();
-  }
-
   /// MachineFunctionInfo - Keep track of various per-function pieces of
   /// information for backends that would like to do so.
   ///

diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
index 9c4fe1f9b08c2d8e2cfbfab61895ebf8e6a4a47d..552254f7b58e9cd6ebf7ab0c896e6b0bc49c1756 100644 (file)
--- a/include/llvm/Intrinsics.td
+++ b/include/llvm/Intrinsics.td
@@ -310,9 +310,6 @@ let Properties = [IntrNoMem] in {
   def int_eh_sjlj_longjmp : Intrinsic<[llvm_void_ty], [llvm_ptr_ty]>;
   def int_eh_sjlj_lsda    : Intrinsic<[llvm_ptr_ty]>;
 }
-let Properties = [IntrWriteMem] in {
-  def int_eh_sjlj_callsite: Intrinsic<[llvm_void_ty], [llvm_i32_ty]>;
-}
 
 //===---------------- Generic Variable Attribute Intrinsics----------------===//
 //

diff --git a/lib/CodeGen/AsmPrinter/DwarfException.cpp b/lib/CodeGen/AsmPrinter/DwarfException.cpp
index dacaf1b8fdbcf31f4c55c81073c9f163926b37ed..1d773ee53e760e7982472d0c4a64a9f5e90268dd 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfException.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfException.cpp
@@ -640,9 +640,6 @@ void DwarfException::EmitExceptionTable() {
     Asm->EmitULEB128Bytes(SizeSites);
     Asm->EOL("Call-site table length");
 
-
-    assert(MF->getCallSiteCount() == CallSites.size());
-
     // Emit the landing pad site information.
     unsigned idx = 0;
     for (SmallVectorImpl<CallSiteEntry>::const_iterator

diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp
index 9efec1c1caa801f02dbdc21ac3be51724a19e594..5958ae253dc4c1256c81dd50cc9e66ccf01c0cb7 100644 (file)
--- a/lib/CodeGen/MachineFunction.cpp
+++ b/lib/CodeGen/MachineFunction.cpp
@@ -93,9 +93,6 @@ MachineFunction::MachineFunction(Function *F,
                      MachineConstantPool(TM.getTargetData());
   Alignment = TM.getTargetLowering()->getFunctionAlignment(F);
 
-  CallSiteIndex = 0;
-  MaxCallSiteIndex = 0;
-
   // Set up jump table.
   const TargetData &TD = *TM.getTargetData();
   bool IsPic = TM.getRelocationModel() == Reloc::PIC_;

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
index ebcc2a5a5d7ffd328c3ca83d91236bfb9b275156..1ba63c0180870dce78b1e348db0c493b46cd364b 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
@@ -4084,11 +4084,6 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
                              Offset));
     return 0;
   }
-  case Intrinsic::eh_sjlj_callsite: {
-    MachineFunction &MF = DAG.getMachineFunction();
-    MF.setCallSiteIndex(cast<ConstantSDNode>(getValue(I.getOperand(1)))->getZExtValue());
-    return 0;
-  }
   case Intrinsic::convertff:
   case Intrinsic::convertfsi:
   case Intrinsic::convertfui:
@@ -4452,14 +4447,10 @@ void SelectionDAGLowering::LowerCallTo(CallSite CS, SDValue Callee,
   }
 
   if (LandingPad && MMI) {
-    MachineFunction &MF = DAG.getMachineFunction();
     // Insert a label before the invoke call to mark the try range.  This can be
     // used to detect deletion of the invoke via the MachineModuleInfo.
     BeginLabel = MMI->NextLabelID();
 
-    // Map this landing pad to the current call site entry
-    MF.setLandingPadCallSiteIndex(LandingPad, MF.getCallSiteIndex());
-
     // Both PendingLoads and PendingExports must be flushed here;
     // this call might not return.
     (void)getRoot();