diff options
| author | Jeremy Soller <jackpot51@gmail.com> | 2016-11-23 08:21:15 -0700 |
|---|---|---|
| committer | Jeremy Soller <jackpot51@gmail.com> | 2016-11-23 08:21:15 -0700 |
| commit | b3c91dfb6a2e21c82966d0a13f9cd3e51da94654 (patch) | |
| tree | 08bb76f6d05c6295b9ee7c3690b78a9ff52c7693 /src/rustllvm/PassWrapper.cpp | |
| parent | ae2029fc62d744e252a5a077ce0dfbf2d1683d25 (diff) | |
| parent | 9fba8df2115141173ad60837f129f18e74424531 (diff) | |
| download | rust-b3c91dfb6a2e21c82966d0a13f9cd3e51da94654.tar.gz rust-b3c91dfb6a2e21c82966d0a13f9cd3e51da94654.zip | |
Merge branch 'master' into redox
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 |