Merge commit '36b05d2e9f55' from llvm.org/main into apple/main

git apple-llvm automerger · git apple-llvm automerger · commit 34edefeff775 · 2021-01-20T21:18:20.000Z
diff --git a/llvm/utils/gn/secondary/llvm/lib/Analysis/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Analysis/BUILD.gn
@@ -56,6 +56,7 @@ static_library("Analysis") {
     "IRSimilarityIdentifier.cpp",
     "IVDescriptors.cpp",
     "IVUsers.cpp",
+    "ImportedFunctionsInliningStatistics.cpp",
     "IndirectCallPromotionAnalysis.cpp",
     "InlineAdvisor.cpp",
     "InlineCost.cpp",
diff --git a/llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Transforms/Utils/BUILD.gn
@@ -34,7 +34,6 @@ static_library("Utils") {
     "FunctionImportUtils.cpp",
     "GlobalStatus.cpp",
     "GuardUtils.cpp",
-    "ImportedFunctionsInliningStatistics.cpp",
     "InjectTLIMappings.cpp",
     "InlineFunction.cpp",
     "InstructionNamer.cpp",
