diff --git a/llvm/test/Transforms/DCE/basic-preservation.ll b/llvm/test/Transforms/DCE/basic-preservation.ll
index 5a624e0adf9b..f2fc55cdcaa1 100644
--- a/llvm/test/Transforms/DCE/basic-preservation.ll
+++ b/llvm/test/Transforms/DCE/basic-preservation.ll
@@ -1,11 +1,11 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -passes=dce -S --enable-knowledge-retention < %s | FileCheck %s
 
-define void @test(i32* %P) {
+define void @test(ptr %P) {
 ; CHECK-LABEL: @test(
-; CHECK-NEXT:    call void @llvm.assume(i1 true) [ "dereferenceable"(i32* [[P:%.*]], i64 4), "nonnull"(i32* [[P]]), "align"(i32* [[P]], i64 4) ]
+; CHECK-NEXT:    call void @llvm.assume(i1 true) [ "dereferenceable"(ptr [[P:%.*]], i64 4), "nonnull"(ptr [[P]]), "align"(ptr [[P]], i64 4) ]
 ; CHECK-NEXT:    ret void
 ;
-  %a = load i32, i32* %P
+  %a = load i32, ptr %P
   ret void
 }
diff --git a/llvm/test/Transforms/DCE/basic.ll b/llvm/test/Transforms/DCE/basic.ll
index fdff9af1ac64..ea5755d56b20 100644
--- a/llvm/test/Transforms/DCE/basic.ll
+++ b/llvm/test/Transforms/DCE/basic.ll
@@ -10,8 +10,8 @@ define void @test() {
   ret void
 }
 
-declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture) nounwind
-declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture) nounwind
+declare void @llvm.lifetime.start.p0(i64, ptr nocapture) nounwind
+declare void @llvm.lifetime.end.p0(i64, ptr nocapture) nounwind
 
 ; CHECK-LABEL: @test_lifetime_alloca
 define i32 @test_lifetime_alloca() {
@@ -21,20 +21,20 @@ define i32 @test_lifetime_alloca() {
 ; CHECK-NOT: llvm.lifetime.start
 ; CHECK-NOT: llvm.lifetime.end
   %i = alloca i8, align 4
-  call void @llvm.lifetime.start.p0i8(i64 -1, i8* %i)
-  call void @llvm.lifetime.end.p0i8(i64 -1, i8* %i)
+  call void @llvm.lifetime.start.p0(i64 -1, ptr %i)
+  call void @llvm.lifetime.end.p0(i64 -1, ptr %i)
   ret i32 0
 }
 
 ; CHECK-LABEL: @test_lifetime_arg
-define i32 @test_lifetime_arg(i8*) {
+define i32 @test_lifetime_arg(ptr) {
 ; Check that lifetime intrinsics are removed along with the pointer.
 ; CHECK-NEXT: llvm.dbg.value
 ; CHECK-NEXT: ret i32 0
 ; CHECK-NOT: llvm.lifetime.start
 ; CHECK-NOT: llvm.lifetime.end
-  call void @llvm.lifetime.start.p0i8(i64 -1, i8* %0)
-  call void @llvm.lifetime.end.p0i8(i64 -1, i8* %0)
+  call void @llvm.lifetime.start.p0(i64 -1, ptr %0)
+  call void @llvm.lifetime.end.p0(i64 -1, ptr %0)
   ret i32 0
 }
 
@@ -47,13 +47,13 @@ define i32 @test_lifetime_global() {
 ; CHECK-NEXT: ret i32 0
 ; CHECK-NOT: llvm.lifetime.start
 ; CHECK-NOT: llvm.lifetime.end
-  call void @llvm.lifetime.start.p0i8(i64 -1, i8* @glob)
-  call void @llvm.lifetime.end.p0i8(i64 -1, i8* @glob)
+  call void @llvm.lifetime.start.p0(i64 -1, ptr @glob)
+  call void @llvm.lifetime.end.p0(i64 -1, ptr @glob)
   ret i32 0
 }
 
 ; CHECK-LABEL: @test_lifetime_bitcast
-define i32 @test_lifetime_bitcast(i32*) {
+define i32 @test_lifetime_bitcast(ptr) {
 ; Check that lifetime intrinsics are NOT removed when the pointer is a bitcast.
 ; It's not uncommon for two bitcasts to be made: one for lifetime, one for use.
 ; TODO: Support the above case.
@@ -62,9 +62,9 @@ define i32 @test_lifetime_bitcast(i32*) {
 ; CHECK-NEXT: llvm.lifetime.start
 ; CHECK-NEXT: llvm.lifetime.end
 ; CHECK-NEXT: ret i32 0
-  %2 = bitcast i32* %0 to i8*
-  call void @llvm.lifetime.start.p0i8(i64 -1, i8* %2)
-  call void @llvm.lifetime.end.p0i8(i64 -1, i8* %2)
+  %2 = bitcast ptr %0 to ptr
+  call void @llvm.lifetime.start.p0(i64 -1, ptr %2)
+  call void @llvm.lifetime.end.p0(i64 -1, ptr %2)
   ret i32 0
 }