about summary refs log tree commit diff
path: root/src/rustllvm/PassWrapper.cpp
diff options
context:
space:
mode:
authorJake Goulding <jake.goulding@gmail.com>2016-09-24 12:37:04 -0400
committerJake Goulding <jake.goulding@gmail.com>2016-11-18 11:21:47 -0500
commitacc9efa5280a41cc040370e0b55a752baeb8b551 (patch)
treef8afa5484e92d2a999b2f4778252f300af949f44 /src/rustllvm/PassWrapper.cpp
parent01d061fdc04ed78ff65138e96c212ecc678a9f8f (diff)
downloadrust-acc9efa5280a41cc040370e0b55a752baeb8b551.tar.gz
rust-acc9efa5280a41cc040370e0b55a752baeb8b551.zip
[LLVM 4.0] Update AlwaysInliner pass header and constructor
Diffstat (limited to 'src/rustllvm/PassWrapper.cpp')
-rw-r--r--src/rustllvm/PassWrapper.cpp7
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