commit 90c579de5a383cee278acc3f7e7b9d0a656e6a35
author Owen Anderson <resistor@mac.com> Fri Aug 06 18:33:48 2010 +0000
committer Owen Anderson <resistor@mac.com> Fri Aug 06 18:33:48 2010 +0000
tree 3a2949af3670eddb92860ca641fab8a0e27e0e7b
parent e26a7b5e21a49543a727b1b2524a934e73c89772

Reapply r110396, with fixes to appease the Linux buildbot gods.


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

lib/CodeGen/BranchFolding.cpp

diff --git a/lib/CodeGen/BranchFolding.cpp b/lib/CodeGen/BranchFolding.cpp
index 7f98df0..cb81aa3 100644
--- a/lib/CodeGen/BranchFolding.cpp
+++ b/lib/CodeGen/BranchFolding.cpp
@@ -65,7 +65,7 @@
   public:
     static char ID;
     explicit BranchFolderPass(bool defaultEnableTailMerge)
-      : MachineFunctionPass(&ID), BranchFolder(defaultEnableTailMerge) {}
+      : MachineFunctionPass(ID), BranchFolder(defaultEnableTailMerge) {}
 
     virtual bool runOnMachineFunction(MachineFunction &MF);
     virtual const char *getPassName() const { return "Control Flow Optimizer"; }