PM: Port SinkingPass to the new pass manager

llvm-svn: 267199
diff --git a/llvm/test/Transforms/Sink/basic.ll b/llvm/test/Transforms/Sink/basic.ll
index 1bbf161..8ff4126 100644
--- a/llvm/test/Transforms/Sink/basic.ll
+++ b/llvm/test/Transforms/Sink/basic.ll
@@ -1,4 +1,5 @@
 ; RUN: opt < %s -basicaa -sink -S | FileCheck %s
+; RUN: opt < %s -aa-pipeline='basic-aa' -passes='sink' -S | FileCheck %s
 
 @A = external global i32
 @B = external global i32
diff --git a/llvm/test/Transforms/Sink/convergent.ll b/llvm/test/Transforms/Sink/convergent.ll
index 49207db..b209e67 100644
--- a/llvm/test/Transforms/Sink/convergent.ll
+++ b/llvm/test/Transforms/Sink/convergent.ll
@@ -21,4 +21,3 @@
 }
 
 declare i32 @bar() readonly convergent
-