diff --git a/include/llvm/CodeGen/FastISel.h b/include/llvm/CodeGen/FastISel.h
index b395e9710f1..a241756df5b 100644
--- a/include/llvm/CodeGen/FastISel.h
+++ b/include/llvm/CodeGen/FastISel.h
@@ -43,13 +43,13 @@ public:
   SelectInstructions(BasicBlock::iterator Begin, BasicBlock::iterator End,
                      DenseMap<const Value*, unsigned> &ValueMap);
 
+  virtual ~FastISel();
+
 protected:
   FastISel(MachineBasicBlock *mbb, MachineFunction *mf,
            const TargetInstrInfo *tii)
     : MBB(mbb), MF(mf), TII(tii) {}
 
-  virtual ~FastISel();
-
   /// FastEmit_r - This method is called by target-independent code
   /// to request that an instruction with the given type and opcode
   /// be emitted.
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 6a626b90e3e..1536a641a60 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -5115,6 +5115,14 @@ void SelectionDAGISel::BuildSelectionDAG(SelectionDAG &DAG, BasicBlock *LLVMBB,
     if (FastISel *F = TLI.createFastISel(BB, &FuncInfo.MF,
                                        TLI.getTargetMachine().getInstrInfo())) {
       Begin = F->SelectInstructions(Begin, LLVMBB->end(), FuncInfo.ValueMap);
+
+      // Clean up the FastISel object. TODO: Reorganize what data is
+      // stored in the FastISel class itself and what is merely passed
+      // to the SelectInstructions method, and then move the creation
+      // and deletion of the FastISel object up so that it is only
+      // done once per MachineFunction.
+      delete F;
+
       if (Begin == LLVMBB->end())
         // The "fast" selector selected the entire block, so we're done.
         return;