--- a/llvm/test/Transforms/MergeFunc/no-merge-block-address-different-labels.ll	Wed Nov 09 17:47:54 2022 +0900
+++ b/llvm/test/Transforms/MergeFunc/no-merge-block-address-different-labels.ll	Fri Aug 18 09:04:13 2023 +0900
@@ -1,4 +1,4 @@
-; RUN: opt -S -mergefunc < %s | FileCheck %s
+; RUN: opt -S -passes=mergefunc < %s | FileCheck %s
 
 ; There is a slight different in these two functions, in that the label values
 ; are switched. They are thus not mergeable. This tests that block addresses
@@ -16,39 +16,39 @@
 entry:
   %i.addr = alloca i32, align 4
   %ret = alloca i32, align 4
-  %l = alloca i8*, align 8
-  store i32 %i, i32* %i.addr, align 4
-  store i32 0, i32* %ret, align 4
+  %l = alloca ptr, align 8
+  store i32 %i, ptr %i.addr, align 4
+  store i32 0, ptr %ret, align 4
 ; Right here, this is val_0, and later the if might assign val_1
-  store i8* blockaddress(@_Z1fi, %val_0), i8** %l, align 8
-  %0 = load i32, i32* %i.addr, align 4
+  store ptr blockaddress(@_Z1fi, %val_0), ptr %l, align 8
+  %0 = load i32, ptr %i.addr, align 4
   %and = and i32 %0, 256
   %cmp = icmp eq i32 %and, 0
   br i1 %cmp, label %if.then, label %if.end
 
 if.then:
-  store i8* blockaddress(@_Z1fi, %val_1), i8** %l, align 8
+  store ptr blockaddress(@_Z1fi, %val_1), ptr %l, align 8
   br label %if.end
 
 if.end:
-  %1 = load i8*, i8** %l, align 8
+  %1 = load ptr, ptr %l, align 8
   br label %indirectgoto
 
 val_0:
-  store i32 12, i32* %ret, align 4
+  store i32 12, ptr %ret, align 4
   br label %end
 
 val_1:
-  store i32 42, i32* %ret, align 4
+  store i32 42, ptr %ret, align 4
   br label %end
 
 end:
-  %2 = load i32, i32* %ret, align 4
+  %2 = load i32, ptr %ret, align 4
   ret i32 %2
 
 indirectgoto:
-  %indirect.goto.dest = phi i8* [ %1, %if.end ]
-  indirectbr i8* %indirect.goto.dest, [label %val_0, label %val_1]
+  %indirect.goto.dest = phi ptr [ %1, %if.end ]
+  indirectbr ptr %indirect.goto.dest, [label %val_0, label %val_1]
 }
 
 ; Function Attrs: nounwind uwtable
@@ -59,38 +59,38 @@
 entry:
   %i.addr = alloca i32, align 4
   %ret = alloca i32, align 4
-  %l = alloca i8*, align 8
-  store i32 %i, i32* %i.addr, align 4
-  store i32 0, i32* %ret, align 4
+  %l = alloca ptr, align 8
+  store i32 %i, ptr %i.addr, align 4
+  store i32 0, ptr %ret, align 4
 ; This time, we store val_1 initially, and later the if might assign val_0
-  store i8* blockaddress(@_Z1gi, %val_1), i8** %l, align 8
-  %0 = load i32, i32* %i.addr, align 4
+  store ptr blockaddress(@_Z1gi, %val_1), ptr %l, align 8
+  %0 = load i32, ptr %i.addr, align 4
   %and = and i32 %0, 256
   %cmp = icmp eq i32 %and, 0
   br i1 %cmp, label %if.then, label %if.end
 
 if.then:
-  store i8* blockaddress(@_Z1gi, %val_0), i8** %l, align 8
+  store ptr blockaddress(@_Z1gi, %val_0), ptr %l, align 8
   br label %if.end
 
 if.end:
-  %1 = load i8*, i8** %l, align 8
+  %1 = load ptr, ptr %l, align 8
   br label %indirectgoto
 
 val_0:
-  store i32 12, i32* %ret, align 4
+  store i32 12, ptr %ret, align 4
   br label %end
 
 val_1:
-  store i32 42, i32* %ret, align 4
+  store i32 42, ptr %ret, align 4
   br label %end
 
 end:
-  %2 = load i32, i32* %ret, align 4
+  %2 = load i32, ptr %ret, align 4
   ret i32 %2
 
 indirectgoto:
-  %indirect.goto.dest = phi i8* [ %1, %if.end ]
-  indirectbr i8* %indirect.goto.dest, [label %val_1, label %val_0]
+  %indirect.goto.dest = phi ptr [ %1, %if.end ]
+  indirectbr ptr %indirect.goto.dest, [label %val_1, label %val_0]
 }