2 files changed, 3 insertions, 34 deletions
diff --git a/include/llvm/CodeGen/MachineModuleInfo.h b/include/llvm/CodeGen/MachineModuleInfo.h
index 1964625f3e..d36502985a 100644
--- a/include/llvm/CodeGen/MachineModuleInfo.h
+++ b/include/llvm/CodeGen/MachineModuleInfo.h
@@ -113,11 +113,7 @@ class MachineModuleInfo : public ImmutablePass {
   // LandingPads - List of LandingPadInfo describing the landing pad information
   // in the current function.
   std::vector<LandingPadInfo> LandingPads;
-
-  // Map of invoke call site index values to associated begin EH_LABEL for
-  // the current function.
-  DenseMap<unsigned, unsigned> CallSiteMap;
-
+  
   // TypeInfos - List of C++ TypeInfo used in the current function.
   //
   std::vector<GlobalVariable *> TypeInfos;
@@ -302,19 +298,7 @@ public:
   const std::vector<LandingPadInfo> &getLandingPads() const {
     return LandingPads;
   }
-
-  /// setCallSiteBeginLabel - Map the begin label for a call site
-  void setCallSiteBeginLabel(unsigned BeginLabel, unsigned Site) {
-    CallSiteMap[BeginLabel] = Site;
-  }
-
-  /// getCallSiteBeginLabel - Get the call site number for a begin label
-  unsigned getCallSiteBeginLabel(unsigned BeginLabel) {
-    assert(CallSiteMap.count(BeginLabel) &&
-           "Missing call site number for EH_LABEL!");
-    return CallSiteMap[BeginLabel];
-  }
-
+  
   /// getTypeInfos - Return a reference to the C++ typeinfo for the current
   /// function.
   const std::vector<GlobalVariable *> &getTypeInfos() const {
diff --git a/include/llvm/Function.h b/include/llvm/Function.h
index 72cb267ae0..38822332c4 100644
--- a/include/llvm/Function.h
+++ b/include/llvm/Function.h
@@ -24,7 +24,6 @@
 #include "llvm/Argument.h"
 #include "llvm/Attributes.h"
 #include "llvm/Support/Compiler.h"
-#include "llvm/ADT/DenseMap.h"
 
 namespace llvm {
 
@@ -87,8 +86,6 @@ private:
   mutable ArgumentListType ArgumentList;  ///< The formal arguments
   ValueSymbolTable *SymTab;               ///< Symbol table of args/instructions
   AttrListPtr AttributeList;              ///< Parameter attributes
-  DenseMap<Instruction*, unsigned>
-    CallSiteNumbering;                    ///< SjLj EH call site numbering
 
   // HasLazyArguments is stored in Value::SubclassData.
   /*bool HasLazyArguments;*/
@@ -168,19 +165,7 @@ public:
     setValueSubclassData((getSubclassDataFromValue() & 1) |
                          (static_cast<unsigned>(CC) << 1));
   }
-
-  /// setCallSiteNumber - Set the call site number mapping for an invoke
-  /// in the function
-  void setCallSiteNumber(Instruction *II, unsigned Num) {
-    CallSiteNumbering[II] = Num;
-  }
-
-  /// getCallSiteNumber - Get the call site number for an invoke instruction
-  unsigned getCallSiteNumber(Instruction *II) {
-    if (CallSiteNumbering.count(II) == 0) return 0;
-    return CallSiteNumbering[II];
-  }
-
+  
   /// getAttributes - Return the attribute list for this Function.
   ///
   const AttrListPtr &getAttributes() const { return AttributeList; }