diff options
| author | bors <bors@rust-lang.org> | 2016-11-20 07:26:03 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-20 07:26:03 -0600 |
| commit | 8f8944e21a3ff506897d4aaa9ca292fec209cff2 (patch) | |
| tree | 536f24d5bf836820710ffaf65d0c1bd13662a70e /src/rustllvm/PassWrapper.cpp | |
| parent | 224f2cec9cfe1b735b6b1d9a77959aaa7e66af92 (diff) | |
| parent | acc9efa5280a41cc040370e0b55a752baeb8b551 (diff) | |
| download | rust-8f8944e21a3ff506897d4aaa9ca292fec209cff2.tar.gz rust-8f8944e21a3ff506897d4aaa9ca292fec209cff2.zip | |
Auto merge of #37861 - shepmaster:llvm-4.0-inline-pass, r=alexcrichton
[LLVM 4.0] Update AlwaysInliner pass header and constructor
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
| -rw-r--r-- | src/rustllvm/PassWrapper.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp index a5ba1d219c3..70f7ee3004d 100644 --- a/src/rustllvm/PassWrapper.cpp +++ b/src/rustllvm/PassWrapper.cpp @@ -22,6 +22,9 @@ #include "llvm/Target/TargetSubtargetInfo.h" #include "llvm/Transforms/IPO/PassManagerBuilder.h" +#if LLVM_VERSION_GE(4, 0) +#include "llvm/Transforms/IPO/AlwaysInliner.h" +#endif #include "llvm-c/Transforms/PassManagerBuilder.h" @@ -539,7 +542,11 @@ LLVMRustPrintPasses() { extern "C" void LLVMRustAddAlwaysInlinePass(LLVMPassManagerBuilderRef PMB, bool AddLifetimes) { +#if LLVM_VERSION_GE(4, 0) + unwrap(PMB)->Inliner = llvm::createAlwaysInlinerLegacyPass(AddLifetimes); +#else unwrap(PMB)->Inliner = createAlwaysInlinerPass(AddLifetimes); +#endif } extern "C" void |