llvm
diff --git a/‎llvm/docs/ConvergenceAndUniformity.rst
+1-1 b/‎llvm/docs/ConvergenceAndUniformity.rst
+1-1
diff --git a/‎llvm/include/llvm/ADT/GenericUniformityInfo.h
-4 b/‎llvm/include/llvm/ADT/GenericUniformityInfo.h
-4
diff --git a/‎llvm/include/llvm/Analysis/DivergenceAnalysis.h
-210 b/‎llvm/include/llvm/Analysis/DivergenceAnalysis.h
-210
diff --git a/‎llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h
-103 b/‎llvm/include/llvm/Analysis/LegacyDivergenceAnalysis.h
-103
diff --git a/‎llvm/include/llvm/Analysis/Passes.h
-7 b/‎llvm/include/llvm/Analysis/Passes.h
-7
@@ -51,7 +51,7 @@ subgroups):
 This document presents a definition of convergence that is reasonable
 for real targets and is compatible with the currently implicit
 semantics of convergent operations in LLVM IR. This is accompanied by
-a *uniformity analysis* that extends the existing divergence analysis
+a *uniformity analysis* that extends previous work on divergence analysis
 [DivergenceSPMD]_ to cover irreducible control-flow.
 
 .. [DivergenceSPMD] Julian Rosemann, Simon Moll, and Sebastian
 
@@ -9,11 +9,7 @@
 #ifndef LLVM_ADT_GENERICUNIFORMITYINFO_H
 #define LLVM_ADT_GENERICUNIFORMITYINFO_H
 
-// #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/GenericCycleInfo.h"
-// #include "llvm/ADT/SmallPtrSet.h"
-// #include "llvm/ADT/Uniformity.h"
-// #include "llvm/Analysis/LegacyDivergenceAnalysis.h"
 #include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
 
@@ -46,13 +46,6 @@ namespace llvm {
   //
   FunctionPass *createDelinearizationPass();
 
-  //===--------------------------------------------------------------------===//
-  //
-  // createLegacyDivergenceAnalysisPass - This pass determines which branches in a GPU
-  // program are divergent.
-  //
-  FunctionPass *createLegacyDivergenceAnalysisPass();
-
   //===--------------------------------------------------------------------===//
   //
   // Minor pass prototypes, allowing us to expose them through bugpoint and