<div dir="ltr">That's the plan - I'm looking at that at the moment.<div><br></div><div style>- Lang.</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Mar 13, 2013 at 2:29 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">On Wed, Mar 13, 2013 at 2:18 PM, Lang Hames <<a href="mailto:lhames@gmail.com">lhames@gmail.com</a>> wrote:<br>

> Author: lhames<br>
> Date: Wed Mar 13 16:18:46 2013<br>
> New Revision: 176977<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=176977&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=176977&view=rev</a><br>
> Log:<br>
> Make LTO codegen use a PassManager, rather than a FunctionPassManager, for the<br>
> codegen passes. This brings it in to line with clang and llc's codegen setup,<br>
> and tidies up the code.<br>
><br>
> If I understand correctly, adding ModulePasses to a FunctionPassManager is<br>
> bogus. It only seems to explode if an added ModulePass depends on a<br>
> FunctionPass though, which might be why this code has survived so long.<br>
<br>
</div>Worth putting in some asserts (or whatever else) to make this fail faster?<br>
<div class="HOEnZb"><div class="h5"><br>
><br>
> Fixes <rdar://problem/13386816>.<br>
><br>
><br>
> Modified:<br>
>     llvm/trunk/tools/lto/LTOCodeGenerator.cpp<br>
><br>
> Modified: llvm/trunk/tools/lto/LTOCodeGenerator.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.cpp?rev=176977&r1=176976&r2=176977&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lto/LTOCodeGenerator.cpp?rev=176977&r1=176976&r2=176977&view=diff</a><br>

> ==============================================================================<br>
> --- llvm/trunk/tools/lto/LTOCodeGenerator.cpp (original)<br>
> +++ llvm/trunk/tools/lto/LTOCodeGenerator.cpp Wed Mar 13 16:18:46 2013<br>
> @@ -390,14 +390,14 @@ bool LTOCodeGenerator::generateObjectFil<br>
>    // Make sure everything is still good.<br>
>    passes.add(createVerifierPass());<br>
><br>
> -  FunctionPassManager *codeGenPasses = new FunctionPassManager(mergedModule);<br>
> +  PassManager codeGenPasses;<br>
><br>
> -  codeGenPasses->add(new DataLayout(*_target->getDataLayout()));<br>
> -  _target->addAnalysisPasses(*codeGenPasses);<br>
> +  codeGenPasses.add(new DataLayout(*_target->getDataLayout()));<br>
> +  _target->addAnalysisPasses(codeGenPasses);<br>
><br>
>    formatted_raw_ostream Out(out);<br>
><br>
> -  if (_target->addPassesToEmitFile(*codeGenPasses, Out,<br>
> +  if (_target->addPassesToEmitFile(codeGenPasses, Out,<br>
>                                     TargetMachine::CGFT_ObjectFile)) {<br>
>      errMsg = "target file type not supported";<br>
>      return true;<br>
> @@ -407,15 +407,7 @@ bool LTOCodeGenerator::generateObjectFil<br>
>    passes.run(*mergedModule);<br>
><br>
>    // Run the code generator, and write assembly file<br>
> -  codeGenPasses->doInitialization();<br>
> -<br>
> -  for (Module::iterator<br>
> -         it = mergedModule->begin(), e = mergedModule->end(); it != e; ++it)<br>
> -    if (!it->isDeclaration())<br>
> -      codeGenPasses->run(*it);<br>
> -<br>
> -  codeGenPasses->doFinalization();<br>
> -  delete codeGenPasses;<br>
> +  codeGenPasses.run(*mergedModule);<br>
><br>
>    return false; // success<br>
>  }<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div>