From: Chandler Carruth <chandlerc@gmail.com>
Date: Wed, 17 Aug 2016 03:09:11 +0000 (+0000)
Subject: [PM] Update Clang for LLVM's r278896 which re-organized a header.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b230c5a56d7d21cce2005c7b600d7cbb3770737;p=clang

[PM] Update Clang for LLVM's r278896 which re-organized a header.

(sorry this didn't get landed closer in time...)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@278897 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index 80d043aa9c..4be716ef12 100644
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -42,6 +42,7 @@
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetSubtargetInfo.h"
 #include "llvm/Transforms/IPO.h"
+#include "llvm/Transforms/IPO/AlwaysInliner.h"
 #include "llvm/Transforms/IPO/PassManagerBuilder.h"
 #include "llvm/Transforms/Instrumentation.h"
 #include "llvm/Transforms/ObjCARC.h"
@@ -318,9 +319,9 @@ void EmitAssemblyHelper::CreatePasses(legacy::PassManager &MPM,
     // Respect always_inline.
     if (OptLevel == 0)
       // Do not insert lifetime intrinsics at -O0.
-      PMBuilder.Inliner = createAlwaysInlinerPass(false);
+      PMBuilder.Inliner = createAlwaysInlinerLegacyPass(false);
     else
-      PMBuilder.Inliner = createAlwaysInlinerPass();
+      PMBuilder.Inliner = createAlwaysInlinerLegacyPass();
     break;
   }