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

llvm-svn: 110460
diff --git a/llvm/lib/CodeGen/RenderMachineFunction.h b/llvm/lib/CodeGen/RenderMachineFunction.h
index 4d22b34..71a613b 100644
--- a/llvm/lib/CodeGen/RenderMachineFunction.h
+++ b/llvm/lib/CodeGen/RenderMachineFunction.h
@@ -198,7 +198,7 @@
   public:
     static char ID;
 
-    RenderMachineFunction() : MachineFunctionPass(&ID) {}
+    RenderMachineFunction() : MachineFunctionPass(ID) {}
 
     virtual void getAnalysisUsage(AnalysisUsage &au) const;