[llvm] b887da8 - [CGProfile] Fix layering, IPO depends in Instrumentation.

[Benjamin Kramer via llvm-commits]

Author: Benjamin Kramer
Date: 2020-07-10T19:13:47+02:00
New Revision: b887da81cc179575932302b87ae8dc7d3f5e3690

URL: https://github.com/llvm/llvm-project/commit/b887da81cc179575932302b87ae8dc7d3f5e3690
DIFF: https://github.com/llvm/llvm-project/commit/b887da81cc179575932302b87ae8dc7d3f5e3690.diff

LOG: [CGProfile] Fix layering, IPO depends in Instrumentation.

Added: 
    

Modified: 
    llvm/include/llvm/Transforms/IPO.h
    llvm/include/llvm/Transforms/Instrumentation.h
    llvm/lib/Transforms/Instrumentation/CGProfile.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/Transforms/IPO.h b/llvm/include/llvm/Transforms/IPO.h
index d1b9f269d5d4..28e454d3b0fc 100644
--- a/llvm/include/llvm/Transforms/IPO.h
+++ b/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

diff  --git a/llvm/include/llvm/Transforms/Instrumentation.h b/llvm/include/llvm/Transforms/Instrumentation.h
index 04f211da9819..d4373d7b39ea 100644
--- a/llvm/include/llvm/Transforms/Instrumentation.h
+++ b/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

diff  --git a/llvm/lib/Transforms/Instrumentation/CGProfile.cpp b/llvm/lib/Transforms/Instrumentation/CGProfile.cpp
index 05451733625e..0cc0d9b07387 100644
--- a/llvm/lib/Transforms/Instrumentation/CGProfile.cpp
+++ b/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>