From df1d156afc315be3527d1f69cc174ecbc3c1885c Mon Sep 17 00:00:00 2001
From: Nico Weber <nicolasweber@gmx.de>
Date: Wed, 6 Feb 2019 13:53:47 +0000
Subject: [PATCH] gn build: Merge r353265, r353237

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@353298 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/gn/secondary/llvm/lib/Analysis/BUILD.gn       | 1 +
 utils/gn/secondary/llvm/lib/IR/BUILD.gn             | 1 -
 utils/gn/secondary/llvm/unittests/ADT/BUILD.gn      | 1 +
 utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn | 1 +
 utils/gn/secondary/llvm/unittests/IR/BUILD.gn       | 1 -
 5 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/gn/secondary/llvm/lib/Analysis/BUILD.gn b/utils/gn/secondary/llvm/lib/Analysis/BUILD.gn
index 5b203d4d703..0b439ce450c 100644
--- a/utils/gn/secondary/llvm/lib/Analysis/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Analysis/BUILD.gn
@@ -41,6 +41,7 @@ static_library("Analysis") {
     "DependenceAnalysis.cpp",
     "DivergenceAnalysis.cpp",
     "DomPrinter.cpp",
+    "DomTreeUpdater.cpp",
     "DominanceFrontier.cpp",
     "EHPersonalities.cpp",
     "GlobalsModRef.cpp",
diff --git a/utils/gn/secondary/llvm/lib/IR/BUILD.gn b/utils/gn/secondary/llvm/lib/IR/BUILD.gn
index 1596c3d1ac2..4613e0a1570 100644
--- a/utils/gn/secondary/llvm/lib/IR/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/IR/BUILD.gn
@@ -37,7 +37,6 @@ static_library("IR") {
     "DiagnosticHandler.cpp",
     "DiagnosticInfo.cpp",
     "DiagnosticPrinter.cpp",
-    "DomTreeUpdater.cpp",
     "Dominators.cpp",
     "Function.cpp",
     "GVMaterializer.cpp",
diff --git a/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn b/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
index 611df36fd0f..21cdc0bd9d1 100644
--- a/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/ADT/BUILD.gn
@@ -24,6 +24,7 @@ unittest("ADTTests") {
     "DenseSetTest.cpp",
     "DepthFirstIteratorTest.cpp",
     "EquivalenceClassesTest.cpp",
+    "FallibleIteratorTest.cpp",
     "FoldingSet.cpp",
     "FunctionExtrasTest.cpp",
     "FunctionRefTest.cpp",
diff --git a/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn b/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
index e68ef94c4a1..fb9b2ab82d0 100644
--- a/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/Analysis/BUILD.gn
@@ -18,6 +18,7 @@ unittest("AnalysisTests") {
     "CallGraphTest.cpp",
     "CaptureTrackingTest.cpp",
     "DivergenceAnalysisTest.cpp",
+    "DomTreeUpdaterTest.cpp",
     "GlobalsModRefTest.cpp",
     "LazyCallGraphTest.cpp",
     "LoopInfoTest.cpp",
diff --git a/utils/gn/secondary/llvm/unittests/IR/BUILD.gn b/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
index b02a66cf037..647c6a5ba8e 100644
--- a/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/IR/BUILD.gn
@@ -18,7 +18,6 @@ unittest("IRTests") {
     "ConstantsTest.cpp",
     "DebugInfoTest.cpp",
     "DebugTypeODRUniquingTest.cpp",
-    "DomTreeUpdaterTest.cpp",
     "DominatorTreeBatchUpdatesTest.cpp",
     "DominatorTreeTest.cpp",
     "FunctionTest.cpp",
-- 
2.40.0