[llvm] r229094 - [PM] Remove the old 'PassManager.h' header file at the top level of

Chandler Carruth chandlerc at gmail.com
Fri Feb 13 12:41:40 PST 2015


Doh, sorry. I'm trying to figure out why the gold plugin isn't building for
me (which is why I didn't notice this mis-fire of my refactoring) and will
fix right away.

It's a trivial fix, feel free to adjust and commit yourself?

(Also, please keep the list on CC, I actually notice commit problems faster
that way.)

On Fri Feb 13 2015 at 12:28:43 PM H.J. Lu <hjl.tools at gmail.com> wrote:

> It caused:
>
> http://llvm.org/bugs/show_bug.cgi?id=22581
>
> On Fri, Feb 13, 2015 at 2:01 AM, Chandler Carruth <chandlerc at gmail.com>
> wrote:
> > Author: chandlerc
> > Date: Fri Feb 13 04:01:29 2015
> > New Revision: 229094
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=229094&view=rev
> > Log:
> > [PM] Remove the old 'PassManager.h' header file at the top level of
> > LLVM's include tree and the use of using declarations to hide the
> > 'legacy' namespace for the old pass manager.
> >
> > This undoes the primary modules-hostile change I made to keep
> > out-of-tree targets building. I sent an email inquiring about whether
> > this would be reasonable to do at this phase and people seemed fine with
> > it, so making it a reality. This should allow us to start bootstrapping
> > with modules to a certain extent along with making it easier to mix and
> > match headers in general.
> >
> > The updates to any code for users of LLVM are very mechanical. Switch
> > from including "llvm/PassManager.h" to "llvm/IR/LegacyPassManager.h".
> > Qualify the types which now produce compile errors with "legacy::". The
> > most common ones are "PassManager", "PassManagerBase", and
> > "FunctionPassManager".
> >
> > Removed:
> >     llvm/trunk/include/llvm/PassManager.h
> > Modified:
> >     llvm/trunk/bindings/go/llvm/InstrumentationBindings.cpp
> >     llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp
> >     llvm/trunk/examples/Kaleidoscope/Chapter4/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Chapter5/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Chapter6/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Chapter7/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Chapter8/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy-jit.cpp
> >     llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/MCJIT/complete/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/MCJIT/initial/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy-jit.cpp
> >     llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Orc/initial/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp
> >     llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp
> >     llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileUtils.h
> >     llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
> >     llvm/trunk/include/llvm/module.modulemap
> >     llvm/trunk/lib/Analysis/Lint.cpp
> >     llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
> >     llvm/trunk/lib/CodeGen/Passes.cpp
> >     llvm/trunk/lib/ExecutionEngine/MCJIT/MCJIT.cpp
> >     llvm/trunk/lib/IR/Core.cpp
> >     llvm/trunk/lib/LTO/LTOCodeGenerator.cpp
> >     llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
> >     llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> >     llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp
> >     llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
> >     llvm/trunk/lib/Target/Hexagon/HexagonTargetMachine.cpp
> >     llvm/trunk/lib/Target/MSP430/MSP430TargetMachine.cpp
> >     llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp
> >     llvm/trunk/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp
> >     llvm/trunk/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
> >     llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp
> >     llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp
> >     llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp
> >     llvm/trunk/lib/Target/R600/R600MachineScheduler.cpp
> >     llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp
> >     llvm/trunk/lib/Target/Target.cpp
> >     llvm/trunk/lib/Target/TargetMachine.cpp
> >     llvm/trunk/lib/Target/TargetMachineC.cpp
> >     llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
> >     llvm/trunk/lib/Target/XCore/XCoreTargetMachine.cpp
> >     llvm/trunk/lib/Transforms/IPO/IPO.cpp
> >     llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
> >     llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp
> >     llvm/trunk/lib/Transforms/Scalar/Scalar.cpp
> >     llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp
> >     llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp
> >     llvm/trunk/tools/bugpoint/CrashDebugger.cpp
> >     llvm/trunk/tools/bugpoint/ExtractFunction.cpp
> >     llvm/trunk/tools/bugpoint/OptimizerDriver.cpp
> >     llvm/trunk/tools/bugpoint/bugpoint.cpp
> >     llvm/trunk/tools/gold/gold-plugin.cpp
> >     llvm/trunk/tools/llc/llc.cpp
> >     llvm/trunk/tools/llvm-extract/llvm-extract.cpp
> >     llvm/trunk/tools/llvm-stress/llvm-stress.cpp
> >     llvm/trunk/tools/opt/opt.cpp
> >     llvm/trunk/unittests/Analysis/CFGTest.cpp
> >     llvm/trunk/unittests/Analysis/MixedTBAATest.cpp
> >     llvm/trunk/unittests/Analysis/ScalarEvolutionTest.cpp
> >     llvm/trunk/unittests/IR/DominatorTreeTest.cpp
> >     llvm/trunk/unittests/IR/LegacyPassManagerTest.cpp
> >
> > Modified: llvm/trunk/bindings/go/llvm/InstrumentationBindings.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/go/llvm/
> InstrumentationBindings.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/bindings/go/llvm/InstrumentationBindings.cpp (original)
> > +++ llvm/trunk/bindings/go/llvm/InstrumentationBindings.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -13,8 +13,8 @@
> >
> >  #include "InstrumentationBindings.h"
> >  #include "llvm-c/Core.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Transforms/Instrumentation.h"
> >
> >  using namespace llvm;
> >
> > Modified: llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> ExceptionDemo/ExceptionDemo.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp (original)
> > +++ llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -56,8 +56,8 @@
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/Intrinsics.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/Dwarf.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Target/TargetOptions.h"
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Chapter4/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Chapter4/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Chapter4/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Chapter4/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -6,9 +6,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Chapter5/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Chapter5/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Chapter5/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Chapter5/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -6,9 +6,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Chapter6/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Chapter6/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Chapter6/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Chapter6/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -6,9 +6,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Chapter7/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Chapter7/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Chapter7/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Chapter7/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -6,9 +6,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Chapter8/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Chapter8/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Chapter8/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Chapter8/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -8,9 +8,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/Host.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy-jit.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/MCJIT/cached/toy-jit.cpp?rev=229094&r1=229093&
> r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy-jit.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy-jit.cpp Fri Feb
> 13 04:01:29 2015
> > @@ -6,10 +6,10 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/IRReader/IRReader.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/SourceMgr.h"
> >  #include "llvm/Support/TargetSelect.h"
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/MCJIT/cached/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/MCJIT/cached/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -9,10 +9,10 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/IRReader/IRReader.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FileSystem.h"
> >  #include "llvm/Support/Path.h"
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/MCJIT/complete/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/MCJIT/complete/toy.cpp?rev=229094&r1=229093&
> r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/MCJIT/complete/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/MCJIT/complete/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -7,10 +7,10 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/IRReader/IRReader.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FileSystem.h"
> >  #include "llvm/Support/Path.h"
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/MCJIT/initial/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/MCJIT/initial/toy.cpp?rev=229094&r1=229093&
> r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/MCJIT/initial/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/MCJIT/initial/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -6,9 +6,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy-jit.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/MCJIT/lazy/toy-jit.cpp?rev=229094&r1=229093&
> r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy-jit.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy-jit.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -6,9 +6,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/MCJIT/lazy/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/MCJIT/lazy/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -8,9 +8,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Orc/initial/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Orc/initial/toy.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Orc/initial/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Orc/initial/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -8,9 +8,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Orc/lazy_codegen/toy.cpp?rev=229094&r1=229093&
> r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp Fri Feb
> 13 04:01:29 2015
> > @@ -7,9 +7,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/
> Kaleidoscope/Orc/lazy_irgen/toy.cpp?rev=229094&r1=229093&
> r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp (original)
> > +++ llvm/trunk/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -7,9 +7,9 @@
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetSelect.h"
> >  #include "llvm/Transforms/Scalar.h"
> >  #include <cctype>
> >
> > Modified: llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileUtils.h
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/
> llvm/ExecutionEngine/Orc/CompileUtils.h?rev=229094&r1=
> 229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileUtils.h
> (original)
> > +++ llvm/trunk/include/llvm/ExecutionEngine/Orc/CompileUtils.h Fri Feb
> 13 04:01:29 2015
> > @@ -15,9 +15,9 @@
> >  #define LLVM_EXECUTIONENGINE_ORC_COMPILEUTILS_H
> >
> >  #include "llvm/ExecutionEngine/ObjectMemoryBuffer.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/MC/MCContext.h"
> >  #include "llvm/Object/ObjectFile.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Target/TargetMachine.h"
> >
> >  namespace llvm {
> > @@ -34,7 +34,7 @@ public:
> >      SmallVector<char, 0> ObjBufferSV;
> >      raw_svector_ostream ObjStream(ObjBufferSV);
> >
> > -    PassManager PM;
> > +    legacy::PassManager PM;
> >      MCContext *Ctx;
> >      if (TM.addPassesToEmitMC(PM, Ctx, ObjStream))
> >        llvm_unreachable("Target does not support MC emission.");
> >
> > Removed: llvm/trunk/include/llvm/PassManager.h
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/
> llvm/PassManager.h?rev=229093&view=auto
> > ============================================================
> ==================
> > --- llvm/trunk/include/llvm/PassManager.h (original)
> > +++ llvm/trunk/include/llvm/PassManager.h (removed)
> > @@ -1,39 +0,0 @@
> > -//===- llvm/PassManager.h - Container for Passes ----------------*- C++
> -*-===//
> > -//
> > -//                     The LLVM Compiler Infrastructure
> > -//
> > -// This file is distributed under the University of Illinois Open Source
> > -// License. See LICENSE.TXT for details.
> > -//
> > -//===------------------------------------------------------
> ----------------===//
> > -//
> > -// This is a legacy redirect header for the old PassManager. It is
> intended to
> > -// be used by clients that have not been converted to be aware of the
> new pass
> > -// management infrastructure being built for LLVM, which is every client
> > -// initially. Eventually this header (and the legacy management layer)
> will go
> > -// away, but we want to minimize changes to out-of-tree users of LLVM
> in the
> > -// interim.
> > -//
> > -// Note that this header *must not* be included into the same file as
> the new
> > -// pass management infrastructure is included. Things will break
> spectacularly.
> > -// If you are starting that conversion, you should switch to explicitly
> > -// including LegacyPassManager.h and using the legacy namespace.
> > -//
> > -//===------------------------------------------------------
> ----------------===//
> > -
> > -#ifndef LLVM_PASSMANAGER_H
> > -#define LLVM_PASSMANAGER_H
> > -
> > -#include "llvm/IR/LegacyPassManager.h"
> > -
> > -namespace llvm {
> > -
> > -// Pull these into the llvm namespace so that existing code that
> expects it
> > -// there can find it.
> > -using legacy::PassManagerBase;
> > -using legacy::PassManager;
> > -using legacy::FunctionPassManager;
> > -
> > -}
> > -
> > -#endif
> >
> > Modified: llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/
> llvm/Transforms/IPO/PassManagerBuilder.h?rev=229094&r1=229093&r2=229094&
> view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h
> (original)
> > +++ llvm/trunk/include/llvm/Transforms/IPO/PassManagerBuilder.h Fri Feb
> 13 04:01:29 2015
> > @@ -27,8 +27,6 @@ namespace legacy {
> >  class FunctionPassManager;
> >  class PassManagerBase;
> >  }
> > -using legacy::FunctionPassManager;
> > -using legacy::PassManagerBase;
> >
> >  /// PassManagerBuilder - This class is used to set up a standard
> optimization
> >  /// sequence for languages like C and C++, allowing some APIs to
> customize the
> > @@ -59,7 +57,7 @@ public:
> >    /// Extensions are passed the builder itself (so they can see how it
> is
> >    /// configured) as well as the pass manager to add stuff to.
> >    typedef void (*ExtensionFn)(const PassManagerBuilder &Builder,
> > -                              PassManagerBase &PM);
> > +                              legacy::PassManagerBase &PM);
> >    enum ExtensionPointTy {
> >      /// EP_EarlyAsPossible - This extension point allows adding passes
> before
> >      /// any other transformations, allowing them to see the code as it
> is coming
> > @@ -139,19 +137,20 @@ public:
> >    void addExtension(ExtensionPointTy Ty, ExtensionFn Fn);
> >
> >  private:
> > -  void addExtensionsToPM(ExtensionPointTy ETy, PassManagerBase &PM)
> const;
> > -  void addInitialAliasAnalysisPasses(PassManagerBase &PM) const;
> > -  void addLTOOptimizationPasses(PassManagerBase &PM);
> > +  void addExtensionsToPM(ExtensionPointTy ETy,
> > +                         legacy::PassManagerBase &PM) const;
> > +  void addInitialAliasAnalysisPasses(legacy::PassManagerBase &PM)
> const;
> > +  void addLTOOptimizationPasses(legacy::PassManagerBase &PM);
> >
> >  public:
> >    /// populateFunctionPassManager - This fills in the function pass
> manager,
> >    /// which is expected to be run on each function immediately as it is
> >    /// generated.  The idea is to reduce the size of the IR in memory.
> > -  void populateFunctionPassManager(FunctionPassManager &FPM);
> > +  void populateFunctionPassManager(legacy::FunctionPassManager &FPM);
> >
> >    /// populateModulePassManager - This sets up the primary pass manager.
> > -  void populateModulePassManager(PassManagerBase &MPM);
> > -  void populateLTOPassManager(PassManagerBase &PM);
> > +  void populateModulePassManager(legacy::PassManagerBase &MPM);
> > +  void populateLTOPassManager(legacy::PassManagerBase &PM);
> >  };
> >
> >  /// Registers a function for adding a standard set of passes.  This
> should be
> >
> > Modified: llvm/trunk/include/llvm/module.modulemap
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/
> llvm/module.modulemap?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/include/llvm/module.modulemap (original)
> > +++ llvm/trunk/include/llvm/module.modulemap Fri Feb 13 04:01:29 2015
> > @@ -71,29 +71,11 @@ module LLVM_IR {
> >    umbrella "IR"
> >    module * { export * }
> >
> > -  // We cannot have llvm/PassManager.h and llvm/IR/PassManager.h in the
> same TU,
> > -  // so we can't include llvm/IR/PassManager.h in the IR module.
> > -  exclude header "IR/PassManager.h"
> > -  exclude header "IR/LegacyPassManager.h"
> > -
> >    // These are intended for (repeated) textual inclusion.
> >    textual header "IR/Instruction.def"
> >    textual header "IR/Metadata.def"
> >  }
> >
> > -module LLVM_LegacyPassManager {
> > -  requires cplusplus
> > -  module CompatInterface { header "PassManager.h" export * }
> > -  module Implementation { header "IR/LegacyPassManager.h" export * }
> > -}
> > -
> > -module LLVM_IR_PassManager {
> > -  requires cplusplus
> > -  // FIXME PR19358: This doesn't work! conflict LLVM_LegacyPassManager,
> "cannot use legacy pass manager and new pass manager in same file"
> > -  header "IR/PassManager.h"
> > -  export *
> > -}
> > -
> >  module LLVM_IRReader { requires cplusplus umbrella "IRReader" module *
> { export * } }
> >  module LLVM_LineEditor { requires cplusplus umbrella "LineEditor"
> module * { export * } }
> >  module LLVM_LTO { requires cplusplus umbrella "LTO" module * { export *
> } }
> >
> > Modified: llvm/trunk/lib/Analysis/Lint.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> Analysis/Lint.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Analysis/Lint.cpp (original)
> > +++ llvm/trunk/lib/Analysis/Lint.cpp Fri Feb 13 04:01:29 2015
> > @@ -51,8 +51,8 @@
> >  #include "llvm/IR/Function.h"
> >  #include "llvm/IR/InstVisitor.h"
> >  #include "llvm/IR/IntrinsicInst.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/raw_ostream.h"
> >  using namespace llvm;
> > @@ -903,7 +903,7 @@ void llvm::lintFunction(const Function &
> >    Function &F = const_cast<Function&>(f);
> >    assert(!F.isDeclaration() && "Cannot lint external functions");
> >
> > -  FunctionPassManager FPM(F.getParent());
> > +  legacy::FunctionPassManager FPM(F.getParent());
> >    Lint *V = new Lint();
> >    FPM.add(V);
> >    FPM.run(F);
> > @@ -912,7 +912,7 @@ void llvm::lintFunction(const Function &
> >  /// lintModule - Check a module for errors, printing messages on stderr.
> >  ///
> >  void llvm::lintModule(const Module &M) {
> > -  PassManager PM;
> > +  legacy::PassManager PM;
> >    Lint *V = new Lint();
> >    PM.add(V);
> >    PM.run(const_cast<Module&>(M));
> >
> > Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> CodeGen/LLVMTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -22,13 +22,13 @@
> >  #include "llvm/CodeGen/MachineModuleInfo.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/IRPrintingPasses.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> >  #include "llvm/MC/MCContext.h"
> >  #include "llvm/MC/MCInstrInfo.h"
> >  #include "llvm/MC/MCStreamer.h"
> >  #include "llvm/MC/MCSubtargetInfo.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/ErrorHandling.h"
> >  #include "llvm/Support/FormattedStream.h"
> >
> > Modified: llvm/trunk/lib/CodeGen/Passes.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> CodeGen/Passes.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/CodeGen/Passes.cpp (original)
> > +++ llvm/trunk/lib/CodeGen/Passes.cpp Fri Feb 13 04:01:29 2015
> > @@ -17,9 +17,9 @@
> >  #include "llvm/CodeGen/MachineFunctionPass.h"
> >  #include "llvm/CodeGen/RegAllocRegistry.h"
> >  #include "llvm/IR/IRPrintingPasses.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/ErrorHandling.h"
> >
> > Modified: llvm/trunk/lib/ExecutionEngine/MCJIT/MCJIT.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> ExecutionEngine/MCJIT/MCJIT.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/ExecutionEngine/MCJIT/MCJIT.cpp (original)
> > +++ llvm/trunk/lib/ExecutionEngine/MCJIT/MCJIT.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -15,12 +15,12 @@
> >  #include "llvm/IR/DataLayout.h"
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/Function.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Mangler.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> >  #include "llvm/Object/Archive.h"
> >  #include "llvm/Object/ObjectFile.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/DynamicLibrary.h"
> >  #include "llvm/Support/ErrorHandling.h"
> >  #include "llvm/Support/MemoryBuffer.h"
> > @@ -135,7 +135,7 @@ std::unique_ptr<MemoryBuffer> MCJIT::emi
> >    // MCJIT instance, since these conditions are tested by our caller,
> >    // generateCodeForModule.
> >
> > -  PassManager PM;
> > +  legacy::PassManager PM;
> >
> >    M->setDataLayout(TM->getDataLayout());
> >    PM.add(new DataLayoutPass());
> >
> > Modified: llvm/trunk/lib/IR/Core.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/
> Core.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/IR/Core.cpp (original)
> > +++ llvm/trunk/lib/IR/Core.cpp Fri Feb 13 04:01:29 2015
> > @@ -26,8 +26,8 @@
> >  #include "llvm/IR/InlineAsm.h"
> >  #include "llvm/IR/IntrinsicInst.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/ErrorHandling.h"
> >  #include "llvm/Support/FileSystem.h"
> > @@ -2845,11 +2845,11 @@ LLVMPassRegistryRef LLVMGetGlobalPassReg
> >  /*===-- Pass Manager ------------------------------
> ------------------------===*/
> >
> >  LLVMPassManagerRef LLVMCreatePassManager() {
> > -  return wrap(new PassManager());
> > +  return wrap(new legacy::PassManager());
> >  }
> >
> >  LLVMPassManagerRef LLVMCreateFunctionPassManagerForModule(LLVMModuleRef
> M) {
> > -  return wrap(new FunctionPassManager(unwrap(M)));
> > +  return wrap(new legacy::FunctionPassManager(unwrap(M)));
> >  }
> >
> >  LLVMPassManagerRef LLVMCreateFunctionPassManager(LLVMModuleProviderRef
> P) {
> > @@ -2858,19 +2858,19 @@ LLVMPassManagerRef LLVMCreateFunctionPas
> >  }
> >
> >  LLVMBool LLVMRunPassManager(LLVMPassManagerRef PM, LLVMModuleRef M) {
> > -  return unwrap<PassManager>(PM)->run(*unwrap(M));
> > +  return unwrap<legacy::PassManager>(PM)->run(*unwrap(M));
> >  }
> >
> >  LLVMBool LLVMInitializeFunctionPassManager(LLVMPassManagerRef FPM) {
> > -  return unwrap<FunctionPassManager>(FPM)->doInitialization();
> > +  return unwrap<legacy::FunctionPassManager>(FPM)->doInitialization();
> >  }
> >
> >  LLVMBool LLVMRunFunctionPassManager(LLVMPassManagerRef FPM,
> LLVMValueRef F) {
> > -  return unwrap<FunctionPassManager>(FPM)->run(*unwrap<Function>(F));
> > +  return unwrap<legacy::FunctionPassManager>(FPM)->
> run(*unwrap<Function>(F));
> >  }
> >
> >  LLVMBool LLVMFinalizeFunctionPassManager(LLVMPassManagerRef FPM) {
> > -  return unwrap<FunctionPassManager>(FPM)->doFinalization();
> > +  return unwrap<legacy::FunctionPassManager>(FPM)->doFinalization();
> >  }
> >
> >  void LLVMDisposePassManager(LLVMPassManagerRef PM) {
> >
> > Modified: llvm/trunk/lib/LTO/LTOCodeGenerator.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/
> LTOCodeGenerator.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/LTO/LTOCodeGenerator.cpp (original)
> > +++ llvm/trunk/lib/LTO/LTOCodeGenerator.cpp Fri Feb 13 04:01:29 2015
> > @@ -26,6 +26,7 @@
> >  #include "llvm/IR/DiagnosticInfo.h"
> >  #include "llvm/IR/DiagnosticPrinter.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Mangler.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > @@ -35,7 +36,6 @@
> >  #include "llvm/MC/MCAsmInfo.h"
> >  #include "llvm/MC/MCContext.h"
> >  #include "llvm/MC/SubtargetFeature.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FileSystem.h"
> >  #include "llvm/Support/FormattedStream.h"
> > @@ -428,7 +428,7 @@ void LTOCodeGenerator::applyScopeRestric
> >    Module *mergedModule = IRLinker.getModule();
> >
> >    // Start off with a verification pass.
> > -  PassManager passes;
> > +  legacy::PassManager passes;
> >    passes.add(createVerifierPass());
> >    passes.add(createDebugInfoVerifierPass());
> >
> > @@ -499,7 +499,7 @@ bool LTOCodeGenerator::optimize(bool Dis
> >    this->applyScopeRestrictions();
> >
> >    // Instantiate the pass manager to organize the passes.
> > -  PassManager passes;
> > +  legacy::PassManager passes;
> >
> >    // Add an appropriate DataLayout instance for this module...
> >    mergedModule->setDataLayout(TargetMach->getDataLayout());
> > @@ -538,7 +538,7 @@ bool LTOCodeGenerator::compileOptimized(
> >    // Mark which symbols can not be internalized
> >    this->applyScopeRestrictions();
> >
> > -  PassManager codeGenPasses;
> > +  legacy::PassManager codeGenPasses;
> >
> >    codeGenPasses.add(new DataLayoutPass());
> >
> >
> > Modified: llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> AArch64/AArch64TargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/AArch64/AArch64TargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -17,7 +17,7 @@
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/CodeGen/RegAllocRegistry.h"
> >  #include "llvm/IR/Function.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  #include "llvm/Target/TargetOptions.h"
> >
> > Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> ARM/ARMTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -17,8 +17,8 @@
> >  #include "ARMTargetTransformInfo.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/Function.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FormattedStream.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >
> > Modified: llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> BPF/BPFTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/BPF/BPFTargetMachine.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -14,7 +14,7 @@
> >  #include "BPF.h"
> >  #include "BPFTargetMachine.h"
> >  #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/Support/FormattedStream.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >
> > Modified: llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> CppBackend/CPPBackend.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp (original)
> > +++ llvm/trunk/lib/Target/CppBackend/CPPBackend.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -22,12 +22,12 @@
> >  #include "llvm/IR/InlineAsm.h"
> >  #include "llvm/IR/Instruction.h"
> >  #include "llvm/IR/Instructions.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> >  #include "llvm/MC/MCInstrInfo.h"
> >  #include "llvm/MC/MCSubtargetInfo.h"
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/ErrorHandling.h"
> >  #include "llvm/Support/FormattedStream.h"
> > @@ -1942,7 +1942,6 @@ void CppWriter::printModuleBody() {
> >  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";
> > @@ -1956,6 +1955,7 @@ void CppWriter::printProgram(const std::
> >    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/LegacyPassManager.h>\n";
> >    Out << "#include <llvm/IR/Module.h>\n";
> >    Out << "#include <llvm/Support/FormattedStream.h>\n";
> >    Out << "#include <llvm/Support/MathExtras.h>\n";
> >
> > Modified: llvm/trunk/lib/Target/Hexagon/HexagonTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> Hexagon/HexagonTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/Hexagon/HexagonTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/Hexagon/HexagonTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -17,8 +17,8 @@
> >  #include "HexagonMachineScheduler.h"
> >  #include "HexagonTargetObjectFile.h"
> >  #include "llvm/CodeGen/Passes.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  #include "llvm/Transforms/IPO/PassManagerBuilder.h"
> >
> > Modified: llvm/trunk/lib/Target/MSP430/MSP430TargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> MSP430/MSP430TargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/MSP430/MSP430TargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/MSP430/MSP430TargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -15,8 +15,8 @@
> >  #include "MSP430.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  using namespace llvm;
> >
> >
> > Modified: llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> Mips/MipsTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -29,7 +29,7 @@
> >  #include "MipsTargetObjectFile.h"
> >  #include "llvm/Analysis/TargetTransformInfo.h"
> >  #include "llvm/CodeGen/Passes.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  #include "llvm/Support/raw_ostream.h"
> >
> > Modified: llvm/trunk/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/NVPTX/
> NVPTXAssignValidGlobalNames.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp
> (original)
> > +++ llvm/trunk/lib/Target/NVPTX/NVPTXAssignValidGlobalNames.cpp Fri Feb
> 13 04:01:29 2015
> > @@ -19,8 +19,8 @@
> >
> >  #include "NVPTX.h"
> >  #include "llvm/IR/GlobalVariable.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/raw_ostream.h"
> >  #include <string>
> >
> >
> > Modified: llvm/trunk/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> NVPTX/NVPTXGenericToNVVM.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp (original)
> > +++ llvm/trunk/lib/Target/NVPTX/NVPTXGenericToNVVM.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -22,10 +22,10 @@
> >  #include "llvm/IR/IRBuilder.h"
> >  #include "llvm/IR/Instructions.h"
> >  #include "llvm/IR/Intrinsics.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Operator.h"
> >  #include "llvm/IR/ValueMap.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Transforms/Utils/ValueMapper.h"
> >
> >  using namespace llvm;
> >
> > Modified: llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> NVPTX/NVPTXTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/NVPTX/NVPTXTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -25,12 +25,12 @@
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/DataLayout.h"
> >  #include "llvm/IR/IRPrintingPasses.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> >  #include "llvm/MC/MCInstrInfo.h"
> >  #include "llvm/MC/MCStreamer.h"
> >  #include "llvm/MC/MCSubtargetInfo.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/FormattedStream.h"
> >
> > Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> PowerPC/PPCTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -17,8 +17,8 @@
> >  #include "PPCTargetTransformInfo.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/Function.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/MC/MCStreamer.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FormattedStream.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >
> > Modified: llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> R600/AMDGPUTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/R600/AMDGPUTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -28,7 +28,7 @@
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/MC/MCAsmInfo.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  #include "llvm/Support/raw_os_ostream.h"
> >  #include "llvm/Transforms/IPO.h"
> >
> > Modified: llvm/trunk/lib/Target/R600/R600MachineScheduler.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> R600/R600MachineScheduler.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/R600/R600MachineScheduler.cpp (original)
> > +++ llvm/trunk/lib/Target/R600/R600MachineScheduler.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -16,7 +16,7 @@
> >  #include "AMDGPUSubtarget.h"
> >  #include "llvm/CodeGen/MachineRegisterInfo.h"
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/raw_ostream.h"
> >
> >  using namespace llvm;
> >
> > Modified: llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> Sparc/SparcTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -14,7 +14,7 @@
> >  #include "SparcTargetObjectFile.h"
> >  #include "Sparc.h"
> >  #include "llvm/CodeGen/Passes.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  using namespace llvm;
> >
> >
> > Modified: llvm/trunk/lib/Target/Target.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> Target.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/Target.cpp (original)
> > +++ llvm/trunk/lib/Target/Target.cpp Fri Feb 13 04:01:29 2015
> > @@ -18,7 +18,7 @@
> >  #include "llvm/IR/LLVMContext.h"
> >  #include "llvm/IR/Value.h"
> >  #include "llvm/InitializePasses.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Analysis/TargetLibraryInfo.h"
> >  #include <cstring>
> >
> >
> > Modified: llvm/trunk/lib/Target/TargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> TargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/TargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/TargetMachine.cpp Fri Feb 13 04:01:29 2015
> > @@ -25,7 +25,7 @@
> >  #include "llvm/MC/MCSectionMachO.h"
> >  #include "llvm/MC/MCTargetOptions.h"
> >  #include "llvm/MC/SectionKind.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Target/TargetLowering.h"
> >  #include "llvm/Target/TargetLoweringObjectFile.h"
> >
> > Modified: llvm/trunk/lib/Target/TargetMachineC.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> TargetMachineC.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/TargetMachineC.cpp (original)
> > +++ llvm/trunk/lib/Target/TargetMachineC.cpp Fri Feb 13 04:01:29 2015
> > @@ -17,7 +17,7 @@
> >  #include "llvm/Analysis/TargetTransformInfo.h"
> >  #include "llvm/IR/DataLayout.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/CodeGen.h"
> >  #include "llvm/Support/FileSystem.h"
> >  #include "llvm/Support/FormattedStream.h"
> > @@ -187,7 +187,7 @@ static LLVMBool LLVMTargetMachineEmit(LL
> >    TargetMachine* TM = unwrap(T);
> >    Module* Mod = unwrap(M);
> >
> > -  PassManager pass;
> > +  legacy::PassManager pass;
> >
> >    std::string error;
> >
> >
> > Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> X86/X86TargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -17,7 +17,7 @@
> >  #include "X86TargetTransformInfo.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/Function.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FormattedStream.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >
> > Modified: llvm/trunk/lib/Target/XCore/XCoreTargetMachine.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/
> XCore/XCoreTargetMachine.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Target/XCore/XCoreTargetMachine.cpp (original)
> > +++ llvm/trunk/lib/Target/XCore/XCoreTargetMachine.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -16,7 +16,7 @@
> >  #include "XCore.h"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/IR/Module.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/TargetRegistry.h"
> >  using namespace llvm;
> >
> >
> > Modified: llvm/trunk/lib/Transforms/IPO/IPO.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> Transforms/IPO/IPO.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Transforms/IPO/IPO.cpp (original)
> > +++ llvm/trunk/lib/Transforms/IPO/IPO.cpp Fri Feb 13 04:01:29 2015
> > @@ -16,7 +16,7 @@
> >  #include "llvm-c/Initialization.h"
> >  #include "llvm-c/Transforms/IPO.h"
> >  #include "llvm/InitializePasses.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Transforms/IPO.h"
> >
> >  using namespace llvm;
> >
> > Modified: llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/
> PassManagerBuilder.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp (original)
> > +++ llvm/trunk/lib/Transforms/IPO/PassManagerBuilder.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -19,7 +19,7 @@
> >  #include "llvm/Analysis/Passes.h"
> >  #include "llvm/IR/DataLayout.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/ManagedStatic.h"
> >  #include "llvm/Analysis/TargetLibraryInfo.h"
> > @@ -117,7 +117,7 @@ void PassManagerBuilder::addExtension(Ex
> >  }
> >
> >  void PassManagerBuilder::addExtensionsToPM(ExtensionPointTy ETy,
> > -                                           PassManagerBase &PM) const {
> > +                                           legacy::PassManagerBase &PM)
> const {
> >    for (unsigned i = 0, e = GlobalExtensions->size(); i != e; ++i)
> >      if ((*GlobalExtensions)[i].first == ETy)
> >        (*GlobalExtensions)[i].second(*this, PM);
> > @@ -126,8 +126,8 @@ void PassManagerBuilder::addExtensionsTo
> >        Extensions[i].second(*this, PM);
> >  }
> >
> > -void
> > -PassManagerBuilder::addInitialAliasAnalysisPasses(PassManagerBase &PM)
> const {
> > +void PassManagerBuilder::addInitialAliasAnalysisPasses(
> > +    legacy::PassManagerBase &PM) const {
> >    // Add TypeBasedAliasAnalysis before BasicAliasAnalysis so that
> >    // BasicAliasAnalysis wins if they disagree. This is intended to help
> >    // support "obvious" type-punning idioms.
> > @@ -138,7 +138,8 @@ PassManagerBuilder::addInitialAliasAnaly
> >    PM.add(createBasicAliasAnalysisPass());
> >  }
> >
> > -void PassManagerBuilder::populateFunctionPassManager(FunctionPassManager
> &FPM) {
> > +void PassManagerBuilder::populateFunctionPassManager(
> > +    legacy::FunctionPassManager &FPM) {
> >    addExtensionsToPM(EP_EarlyAsPossible, FPM);
> >
> >    // Add LibraryInfo if we have some.
> > @@ -158,7 +159,8 @@ void PassManagerBuilder::populateFunctio
> >    FPM.add(createLowerExpectIntrinsicPass());
> >  }
> >
> > -void PassManagerBuilder::populateModulePassManager(PassManagerBase
> &MPM) {
> > +void PassManagerBuilder::populateModulePassManager(
> > +    legacy::PassManagerBase &MPM) {
> >    // If all optimizations are disabled, just run the always-inline pass
> and,
> >    // if enabled, the function merging pass.
> >    if (OptLevel == 0) {
> > @@ -375,7 +377,7 @@ void PassManagerBuilder::populateModuleP
> >    addExtensionsToPM(EP_OptimizerLast, MPM);
> >  }
> >
> > -void PassManagerBuilder::addLTOOptimizationPasses(PassManagerBase &PM)
> {
> > +void PassManagerBuilder::addLTOOptimizationPasses(legacy::PassManagerBase
> &PM) {
> >    // Provide AliasAnalysis services for optimizations.
> >    addInitialAliasAnalysisPasses(PM);
> >
> > @@ -478,7 +480,7 @@ void PassManagerBuilder::addLTOOptimizat
> >      PM.add(createMergeFunctionsPass());
> >  }
> >
> > -void PassManagerBuilder::populateLTOPassManager(PassManagerBase &PM) {
> > +void PassManagerBuilder::populateLTOPassManager(legacy::PassManagerBase
> &PM) {
> >    if (LibraryInfo)
> >      PM.add(new TargetLibraryInfoWrapperPass(*LibraryInfo));
> >
> > @@ -563,7 +565,7 @@ void
> >  LLVMPassManagerBuilderPopulateFunctionPassManager(LLVMPassManagerBuilderRef
> PMB,
> >                                                    LLVMPassManagerRef
> PM) {
> >    PassManagerBuilder *Builder = unwrap(PMB);
> > -  FunctionPassManager *FPM = unwrap<FunctionPassManager>(PM);
> > +  legacy::FunctionPassManager *FPM = unwrap<legacy::
> FunctionPassManager>(PM);
> >    Builder->populateFunctionPassManager(*FPM);
> >  }
> >
> > @@ -571,7 +573,7 @@ void
> >  LLVMPassManagerBuilderPopulateModulePassManager(LLVMPassManagerBuilderRef
> PMB,
> >                                                  LLVMPassManagerRef PM) {
> >    PassManagerBuilder *Builder = unwrap(PMB);
> > -  PassManagerBase *MPM = unwrap(PM);
> > +  legacy::PassManagerBase *MPM = unwrap(PM);
> >    Builder->populateModulePassManager(*MPM);
> >  }
> >
> > @@ -580,7 +582,7 @@ void LLVMPassManagerBuilderPopulateLTOPa
> >                                                    LLVMBool Internalize,
> >                                                    LLVMBool RunInliner) {
> >    PassManagerBuilder *Builder = unwrap(PMB);
> > -  PassManagerBase *LPM = unwrap(PM);
> > +  legacy::PassManagerBase *LPM = unwrap(PM);
> >
> >    // A small backwards compatibility hack. populateLTOPassManager used
> to take
> >    // an RunInliner option.
> >
> > Modified: llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> Transforms/Scalar/PlaceSafepoints.cpp?rev=229094&r1=229093&r2=229094&
> view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp (original)
> > +++ llvm/trunk/lib/Transforms/Scalar/PlaceSafepoints.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -49,7 +49,7 @@
> >  //===-------------------------------------------------------
> ---------------===//
> >
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/ADT/SetOperations.h"
> >  #include "llvm/ADT/Statistic.h"
> >  #include "llvm/Analysis/LoopPass.h"
> > @@ -539,7 +539,7 @@ bool PlaceSafepoints::runOnFunction(Func
> >      // need the pass manager to handle scheduling all the loop passes
> >      // appropriately.  Doing this by hand is painful and just not worth
> messing
> >      // with for the moment.
> > -    FunctionPassManager FPM(F.getParent());
> > +    legacy::FunctionPassManager FPM(F.getParent());
> >      bool CanAssumeCallSafepoints = EnableCallSafepoints;
> >      PlaceBackedgeSafepointsImpl *PBS =
> >        new PlaceBackedgeSafepointsImpl(CanAssumeCallSafepoints);
> >
> > Modified: llvm/trunk/lib/Transforms/Scalar/Scalar.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> Transforms/Scalar/Scalar.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Transforms/Scalar/Scalar.cpp (original)
> > +++ llvm/trunk/lib/Transforms/Scalar/Scalar.cpp Fri Feb 13 04:01:29 2015
> > @@ -20,7 +20,7 @@
> >  #include "llvm/IR/DataLayout.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/InitializePasses.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >
> >  using namespace llvm;
> >
> >
> > Modified: llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> Transforms/Utils/SymbolRewriter.cpp?rev=229094&
> r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp (original)
> > +++ llvm/trunk/lib/Transforms/Utils/SymbolRewriter.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -60,7 +60,7 @@
> >  #define DEBUG_TYPE "symbol-rewriter"
> >  #include "llvm/CodeGen/Passes.h"
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/MemoryBuffer.h"
> >
> > Modified: llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/
> Transforms/Vectorize/Vectorize.cpp?rev=229094&r1=
> 229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp (original)
> > +++ llvm/trunk/lib/Transforms/Vectorize/Vectorize.cpp Fri Feb 13
> 04:01:29 2015
> > @@ -19,7 +19,7 @@
> >  #include "llvm/Analysis/Passes.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/InitializePasses.h"
> > -#include "llvm/PassManager.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >
> >  using namespace llvm;
> >
> >
> > Modified: llvm/trunk/tools/bugpoint/CrashDebugger.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/
> bugpoint/CrashDebugger.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/tools/bugpoint/CrashDebugger.cpp (original)
> > +++ llvm/trunk/tools/bugpoint/CrashDebugger.cpp Fri Feb 13 04:01:29 2015
> > @@ -19,11 +19,11 @@
> >  #include "llvm/IR/Constants.h"
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/Instructions.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/ValueSymbolTable.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/FileUtilities.h"
> >  #include "llvm/Transforms/Scalar.h"
> > @@ -407,7 +407,7 @@ bool ReduceCrashingInstructions::TestIns
> >        }
> >
> >    // Verify that this is still valid.
> > -  PassManager Passes;
> > +  legacy::PassManager Passes;
> >    Passes.add(createVerifierPass());
> >    Passes.add(createDebugInfoVerifierPass());
> >    Passes.run(*M);
> >
> > Modified: llvm/trunk/tools/bugpoint/ExtractFunction.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/
> bugpoint/ExtractFunction.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/tools/bugpoint/ExtractFunction.cpp (original)
> > +++ llvm/trunk/tools/bugpoint/ExtractFunction.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -17,10 +17,10 @@
> >  #include "llvm/IR/DataLayout.h"
> >  #include "llvm/IR/DerivedTypes.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/Pass.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/FileUtilities.h"
> >
> > Modified: llvm/trunk/tools/bugpoint/OptimizerDriver.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/
> bugpoint/OptimizerDriver.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/tools/bugpoint/OptimizerDriver.cpp (original)
> > +++ llvm/trunk/tools/bugpoint/OptimizerDriver.cpp Fri Feb 13 04:01:29
> 2015
> > @@ -18,9 +18,9 @@
> >  #include "BugDriver.h"
> >  #include "llvm/Bitcode/ReaderWriter.h"
> >  #include "llvm/IR/DataLayout.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/Debug.h"
> >  #include "llvm/Support/FileUtilities.h"
> >
> > Modified: llvm/trunk/tools/bugpoint/bugpoint.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/
> bugpoint/bugpoint.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/tools/bugpoint/bugpoint.cpp (original)
> > +++ llvm/trunk/tools/bugpoint/bugpoint.cpp Fri Feb 13 04:01:29 2015
> > @@ -16,10 +16,10 @@
> >  #include "BugDriver.h"
> >  #include "ToolRunner.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/LegacyPassNameParser.h"
> >  #include "llvm/LinkAllIR.h"
> >  #include "llvm/LinkAllPasses.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/CommandLine.h"
> >  #include "llvm/Support/ManagedStatic.h"
> >  #include "llvm/Support/PluginLoader.h"
> > @@ -92,7 +92,7 @@ static void BugpointInterruptFunction()
> >
> >  // Hack to capture a pass list.
> >  namespace {
> > -  class AddToDriver : public FunctionPassManager {
> > +  class AddToDriver : public legacy::FunctionPassManager {
> >      BugDriver &D;
> >    public:
> >      AddToDriver(BugDriver &_D) : FunctionPassManager(nullptr), D(_D) {}
> >
> > Modified: llvm/trunk/tools/gold/gold-plugin.cpp
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/gold/
> gold-plugin.cpp?rev=229094&r1=229093&r2=229094&view=diff
> > ============================================================
> ==================
> > --- llvm/trunk/tools/gold/gold-plugin.cpp (original)
> > +++ llvm/trunk/tools/gold/gold-plugin.cpp Fri Feb 13 04:01:29 2015
> > @@ -24,12 +24,12 @@
> >  #include "llvm/IR/DiagnosticInfo.h"
> >  #include "llvm/IR/DiagnosticPrinter.h"
> >  #include "llvm/IR/LLVMContext.h"
> > +#include "llvm/IR/LegacyPassManager.h"
> >  #include "llvm/IR/Module.h"
> >  #include "llvm/IR/Verifier.h"
> >  #include "llvm/Linker/Linker.h"
> >  #include "llvm/MC/SubtargetFeature.h"
> >  #include "llvm/Object/IRObjectFile.h"
> > -#include "llvm/PassManager.h"
> >  #include "llvm/Support/FormattedStream.h"
> >  #include "llvm/Support/Host.h"
> >  #include "llvm/Support/ManagedStatic.h"
> > @@ -693,11 +693,11 @@ getModuleForFile(LLVMContext &Context, c
> >  }
> >
> >  static void runLTOPasses(Module &M, TargetMachine &TM) {
> > -  PassManager passes;
> > +  legacy::PassManager passes;
> >    passes.add(new DataLayoutPass());
> >    passes.add(createTargetTransformInfoWrapp
> erPass(TM.getTargetIRAnalysis()));
> >
> > -  PassManagerBuilder PMB;
> > +  legacy::PassManagerBuilder PMB;
> >    PMB.LibraryInfo = new TargetLibraryInfoImpl(Triple(
> TM.getTargetTriple()));
> >    PMB.Inliner = createFunctionInliningPass();
> >    PMB.VerifyInput = true;
> > @@ -743,7 +743,7 @@ static void codegen(Module &M) {
> >    if (options::TheOutputType == options::OT_SAVE_TEMPS)
> >      saveBCFile(output_name + ".opt.b
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150213/5e70bcab/attachment.html>


More information about the llvm-commits mailing list