Merge commit 'b887da81cc17' from llvm.org/master into apple/master

Author: git apple-llvm automerger

llvm/include/llvm/Transforms/IPO.h

@@ -282,8 +282,6 @@ ModulePass *createSampleProfileLoaderPass(StringRef Name);
 ModulePass *createWriteThinLTOBitcodePass(raw_ostream &Str,
                                           raw_ostream *ThinLinkOS = nullptr);
 
-ModulePass *createCGProfileLegacyPass();
-
 } // End llvm namespace
 
 #endif

llvm/include/llvm/Transforms/Instrumentation.h

@@ -88,6 +88,8 @@ ModulePass *createPGOIndirectCallPromotionLegacyPass(bool InLTO = false,
                                                      bool SamplePGO = false);
 FunctionPass *createPGOMemOPSizeOptLegacyPass();
 
+ModulePass *createCGProfileLegacyPass();
+
 // The pgo-specific indirect call promotion function declared below is used by
 // the pgo-driven indirect call promotion and sample profile passes. It's a
 // wrapper around llvm::promoteCall, et al. that additionally computes !prof

llvm/lib/Transforms/Instrumentation/CGProfile.cpp

@@ -18,7 +18,6 @@
 #include "llvm/IR/PassManager.h"
 #include "llvm/InitializePasses.h"
 #include "llvm/ProfileData/InstrProf.h"
-#include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Instrumentation.h"
 
 #include <array>