diff --git a/llvm/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h b/llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h rename from llvm/include/llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h rename to llvm/include/llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h diff --git a/llvm/include/llvm/Transforms/IPO/Inliner.h b/llvm/include/llvm/Transforms/IPO/Inliner.h --- a/llvm/include/llvm/Transforms/IPO/Inliner.h +++ b/llvm/include/llvm/Transforms/IPO/Inliner.h @@ -14,8 +14,8 @@ #include "llvm/Analysis/InlineAdvisor.h" #include "llvm/Analysis/InlineCost.h" #include "llvm/Analysis/LazyCallGraph.h" +#include "llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h" #include "llvm/IR/PassManager.h" -#include "llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h" #include namespace llvm { diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt --- a/llvm/lib/Analysis/CMakeLists.txt +++ b/llvm/lib/Analysis/CMakeLists.txt @@ -58,6 +58,7 @@ IRSimilarityIdentifier.cpp IVDescriptors.cpp IVUsers.cpp + ImportedFunctionsInliningStatistics.cpp IndirectCallPromotionAnalysis.cpp InlineCost.cpp InlineAdvisor.cpp diff --git a/llvm/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp b/llvm/lib/Analysis/ImportedFunctionsInliningStatistics.cpp rename from llvm/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp rename to llvm/lib/Analysis/ImportedFunctionsInliningStatistics.cpp --- a/llvm/lib/Transforms/Utils/ImportedFunctionsInliningStatistics.cpp +++ b/llvm/lib/Analysis/ImportedFunctionsInliningStatistics.cpp @@ -9,7 +9,7 @@ // ThinLTO. //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h" +#include "llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h" #include "llvm/ADT/STLExtras.h" #include "llvm/IR/Function.h" #include "llvm/IR/Module.h" @@ -186,7 +186,7 @@ ImportedFunctionsInliningStatistics::getSortedNodes() { SortedNodesTy SortedNodes; SortedNodes.reserve(NodesMap.size()); - for (const NodesMapTy::value_type& Node : NodesMap) + for (const NodesMapTy::value_type &Node : NodesMap) SortedNodes.push_back(&Node); llvm::sort(SortedNodes, [&](const SortedNodesTy::value_type &Lhs, diff --git a/llvm/lib/Transforms/IPO/Inliner.cpp b/llvm/lib/Transforms/IPO/Inliner.cpp --- a/llvm/lib/Transforms/IPO/Inliner.cpp +++ b/llvm/lib/Transforms/IPO/Inliner.cpp @@ -36,6 +36,7 @@ #include "llvm/Analysis/ProfileSummaryInfo.h" #include "llvm/Analysis/TargetLibraryInfo.h" #include "llvm/Analysis/TargetTransformInfo.h" +#include "llvm/Analysis/Utils/ImportedFunctionsInliningStatistics.h" #include "llvm/IR/Attributes.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/DataLayout.h" @@ -59,7 +60,6 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/Utils/CallPromotionUtils.h" #include "llvm/Transforms/Utils/Cloning.h" -#include "llvm/Transforms/Utils/ImportedFunctionsInliningStatistics.h" #include "llvm/Transforms/Utils/Local.h" #include "llvm/Transforms/Utils/ModuleUtils.h" #include diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt --- a/llvm/lib/Transforms/Utils/CMakeLists.txt +++ b/llvm/lib/Transforms/Utils/CMakeLists.txt @@ -28,7 +28,6 @@ GlobalStatus.cpp GuardUtils.cpp InlineFunction.cpp - ImportedFunctionsInliningStatistics.cpp InjectTLIMappings.cpp InstructionNamer.cpp IntegerDivision.cpp