Fix CPPBackend CodeGen

[chenwj]

Summary

Fix CPPBackend CodeGen so that its output can be compiled with the current trunk.

[t.p.northover]

I think this looks fine, having chased down the default arguments. But just to make sure: we both think the verifier will default to dbgs() for its output after this change (mainly rather than /dev/null)?

If so, go for it (and thanks for working on the update).

Tim.

[chenwj]

In D6011#4, @t.p.northover wrote:

I think this looks fine, having chased down the default arguments. But just to make sure: we both think the verifier will default to dbgs() for its output after this change (mainly rather than /dev/null)?

If so, go for it (and thanks for working on the update).

Tim.

Thanks, Tim.

[Eugene.Zelenko]

Looks like patch was not committed, but as build fix it most likely obsolete.

lib/Target/CppBackend/CPPBackend.cpp

 }
 
 void CppWriter::printProgram(const std::string& fname,
                              const std::string& mName) {
   Out << "#include <llvm/Pass.h>\n";
   Out << "#include <llvm/PassManager.h>\n";
 
   Out << "#include <llvm/ADT/SmallVector.h>\n";
-  Out << "#include <llvm/Analysis/Verifier.h>\n";
+  Out << "#include <llvm/IR/Verifier.h>\n";
   Out << "#include <llvm/IR/BasicBlock.h>\n";
   Out << "#include <llvm/IR/CallingConv.h>\n";
   Out << "#include <llvm/IR/Constants.h>\n";
   Out << "#include <llvm/IR/DerivedTypes.h>\n";
   Out << "#include <llvm/IR/Function.h>\n";
   Out << "#include <llvm/IR/GlobalVariable.h>\n";
   Out << "#include <llvm/IR/IRPrintingPasses.h>\n";
   Out << "#include <llvm/IR/InlineAsm.h>\n";
   Out << "#include <llvm/IR/Instructions.h>\n";
   Out << "#include <llvm/IR/LLVMContext.h>\n";
   Out << "#include <llvm/IR/Module.h>\n";
   Out << "#include <llvm/Support/FormattedStream.h>\n";
   Out << "#include <llvm/Support/MathExtras.h>\n";
   Out << "#include <algorithm>\n";
   Out << "using namespace llvm;\n\n";
   Out << "Module* " << fname << "();\n\n";
   Out << "int main(int argc, char**argv) {\n";
   Out << "  Module* Mod = " << fname << "();\n";
-  Out << "  verifyModule(*Mod, PrintMessageAction);\n";
+  Out << "  verifyModule(*Mod);\n";
   Out << "  PassManager PM;\n";
-  Out << "  PM.add(createPrintModulePass(&outs()));\n";
+  Out << "  PM.add(createPrintModulePass(outs()));\n";
   Out << "  PM.run(*Mod);\n";
   Out << "  return 0;\n";
   Out << "}\n\n";
   printModule(fname,mName);
 }
 
 void CppWriter::printModule(const std::string& fname,
                             const std::string& mName) {