diff --git a/llvm/test/Instrumentation/MemorySanitizer/byval.ll b/llvm/test/Instrumentation/MemorySanitizer/byval.ll
index a636847229be37..efc03af25674cf 100644
--- a/llvm/test/Instrumentation/MemorySanitizer/byval.ll
+++ b/llvm/test/Instrumentation/MemorySanitizer/byval.ll
@@ -1,3 +1,4 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt < %s -S -passes="msan<track-origins=1>" 2>&1 | FileCheck %s --implicit-check-not "call void @llvm.mem" --implicit-check-not " load" --implicit-check-not " store"
 ; RUN: opt < %s -S -msan -msan-track-origins=1 | FileCheck %s --implicit-check-not "call void @llvm.mem" --implicit-check-not " load" --implicit-check-not " store"
 
@@ -10,13 +11,13 @@ declare void @Fn(i128* %p);
 define i128 @ByValArgument(i32, i128* byval(i128) %p) sanitize_memory {
 ; CHECK-LABEL: @ByValArgument(
 ; CHECK-NEXT:  entry:
-; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64({{.*}} @__msan_param_tls to i64), i64 8) to i8*), i64 16, i1 false)
-; CHECK:         %x = load i128, i128* %p
-; CHECK:         load i128
-; CHECK:         load i32
-; CHECK:         store i128 {{.*}}, i128* bitcast ([100 x i64]* @__msan_retval_tls to i128*)
-; CHECK-NEXT:    store i32 {{.*}}, i32* @__msan_retval_origin_tls
-; CHECK-NEXT:    ret i128
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 %[[#]], i8* align 8 inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_param_tls to i64), i64 8) to i8*), i64 16, i1 false)
+; CHECK:         [[X:%.*]] = load i128, i128* %p, align 8
+; CHECK:         [[_MSLD:%.*]] = load i128, i128* %[[#]], align 8
+; CHECK:         %[[#]] = load i32, i32* %[[#]], align 8
+; CHECK:         store i128 [[_MSLD]], i128* bitcast ([100 x i64]* @__msan_retval_tls to i128*), align 8
+; CHECK:         store i32 %[[#]], i32* @__msan_retval_origin_tls, align 4
+; CHECK:         ret i128 [[X]]
 ;
 entry:
   %x = load i128, i128* %p
@@ -26,11 +27,11 @@ entry:
 define i128 @ByValArgumentNoSanitize(i32, i128* byval(i128) %p) {
 ; CHECK-LABEL: @ByValArgumentNoSanitize(
 ; CHECK-NEXT:  entry:
-; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 8 {{.*}}, i8 0, i64 16, i1 false)
-; CHECK:         %x = load i128, i128* %p
-; CHECK:         store i128 0, i128* bitcast ([100 x i64]* @__msan_retval_tls to i128*)
-; CHECK-NEXT:    store i32 0, i32* @__msan_retval_origin_tls
-; CHECK-NEXT:    ret i128
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 8 %[[#]], i8 0, i64 16, i1 false)
+; CHECK:         [[X:%.*]] = load i128, i128* %p, align 8
+; CHECK:         store i128 0, i128* bitcast ([100 x i64]* @__msan_retval_tls to i128*), align 8
+; CHECK:         store i32 0, i32* @__msan_retval_origin_tls, align 4
+; CHECK:         ret i128 [[X]]
 ;
 entry:
   %x = load i128, i128* %p
@@ -41,10 +42,10 @@ entry:
 define void @ByValForward(i32, i128* byval(i128) %p) sanitize_memory {
 ; CHECK-LABEL: @ByValForward(
 ; CHECK-NEXT:  entry:
-; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64({{.*}} @__msan_param_tls to i64), i64 8) to i8*), i64 16, i1 false)
-; CHECK:         store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_param_tls, i32 0, i32 0)
-; CHECK-NEXT:    call void @Fn(
-; CHECK-NEXT:    ret void
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 %[[#]], i8* align 8 inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_param_tls to i64), i64 8) to i8*), i64 16, i1 false)
+; CHECK:         store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_param_tls, i32 0, i32 0), align 8
+; CHECK:         call void @Fn(i128* %p)
+; CHECK:         ret void
 ;
 entry:
   call void @Fn(i128* %p)
@@ -54,10 +55,10 @@ entry:
 define void @ByValForwardNoSanitize(i32, i128* byval(i128) %p) {
 ; CHECK-LABEL: @ByValForwardNoSanitize(
 ; CHECK-NEXT:  entry:
-; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 8 {{.*}}, i8 0, i64 16, i1 false)
-; CHECK:         store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_param_tls, i32 0, i32 0)
-; CHECK-NEXT:    call void @Fn(
-; CHECK-NEXT:    ret void
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 8 %[[#]], i8 0, i64 16, i1 false)
+; CHECK:         store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_param_tls, i32 0, i32 0), align 8
+; CHECK:         call void @Fn(i128* %p)
+; CHECK:         ret void
 ;
 entry:
   call void @Fn(i128* %p)
@@ -68,11 +69,11 @@ entry:
 define void @ByValForwardByVal(i32, i128* byval(i128) %p) sanitize_memory {
 ; CHECK-LABEL: @ByValForwardByVal(
 ; CHECK-NEXT:  entry:
-; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64({{.*}} @__msan_param_tls to i64), i64 8) to i8*), i64 16, i1 false)
-; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast ([100 x i64]* @__msan_param_tls to i8*), i8* {{.*}}, i64 16, i1 false)
-; CHECK:         store i32 {{.*}}, i32* getelementptr inbounds ([200 x i32], [200 x i32]* @__msan_param_origin_tls, i32 0, i32 0)
-; CHECK-NEXT:    call void @FnByVal(
-; CHECK-NEXT:    ret void
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 8 %[[#]], i8* align 8 inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_param_tls to i64), i64 8) to i8*), i64 16, i1 false)
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast ([100 x i64]* @__msan_param_tls to i8*), i8* %[[#]], i64 16, i1 false)
+; CHECK:         store i32 0, i32* getelementptr inbounds ([200 x i32], [200 x i32]* @__msan_param_origin_tls, i32 0, i32 0), align 4
+; CHECK:         call void @FnByVal(i128* byval(i128) %p)
+; CHECK:         ret void
 ;
 entry:
   call void @FnByVal(i128* byval(i128) %p)
@@ -82,14 +83,102 @@ entry:
 define void @ByValForwardByValNoSanitize(i32, i128* byval(i128) %p) {
 ; CHECK-LABEL: @ByValForwardByValNoSanitize(
 ; CHECK-NEXT:  entry:
-; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 8 {{.*}}, i8 0, i64 16, i1 false)
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 8 %[[#]], i8 0, i64 16, i1 false)
 ; CHECK:         call void @llvm.memset.p0i8.i64(i8* bitcast ([100 x i64]* @__msan_param_tls to i8*), i8 0, i64 16, i1 false)
-; CHECK:         store i32 0, i32* getelementptr inbounds ([200 x i32], [200 x i32]* @__msan_param_origin_tls, i32 0, i32 0)
-; CHECK-NEXT:    call void @FnByVal(
-; CHECK-NEXT:    ret void
+; CHECK:         store i32 0, i32* getelementptr inbounds ([200 x i32], [200 x i32]* @__msan_param_origin_tls, i32 0, i32 0), align 4
+; CHECK:         call void @FnByVal(i128* byval(i128) %p)
+; CHECK:         ret void
 ;
 entry:
   call void @FnByVal(i128* byval(i128) %p)
   ret void
 }
 
+declare void @FnByVal8(i8* byval(i8) %p);
+declare void @Fn8(i8* %p);
+
+define i8 @ByValArgument8(i32, i8* byval(i8) %p) sanitize_memory {
+; CHECK-LABEL: @ByValArgument8(
+; CHECK-NEXT:  entry:
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %[[#]], i8* align 1 inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_param_tls to i64), i64 8) to i8*), i64 1, i1 false)
+; CHECK:         [[X:%.*]] = load i8, i8* %p, align 1
+; CHECK:         [[_MSLD:%.*]] = load i8, i8* %[[#]], align 1
+; CHECK:         %[[#]] = load i32, i32* %[[#]], align 4
+; CHECK:         store i8 [[_MSLD]], i8* bitcast ([100 x i64]* @__msan_retval_tls to i8*), align 8
+; CHECK:         store i32 %[[#]], i32* @__msan_retval_origin_tls, align 4
+; CHECK:         ret i8 [[X]]
+;
+entry:
+  %x = load i8, i8* %p
+  ret i8 %x
+}
+
+define i8 @ByValArgumentNoSanitize8(i32, i8* byval(i8) %p) {
+; CHECK-LABEL: @ByValArgumentNoSanitize8(
+; CHECK-NEXT:  entry:
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 1 %[[#]], i8 0, i64 1, i1 false)
+; CHECK:         [[X:%.*]] = load i8, i8* %p, align 1
+; CHECK:         store i8 0, i8* bitcast ([100 x i64]* @__msan_retval_tls to i8*), align 8
+; CHECK:         store i32 0, i32* @__msan_retval_origin_tls, align 4
+; CHECK:         ret i8 [[X]]
+;
+entry:
+  %x = load i8, i8* %p
+  ret i8 %x
+}
+
+define void @ByValForward8(i32, i8* byval(i8) %p) sanitize_memory {
+; CHECK-LABEL: @ByValForward8(
+; CHECK-NEXT:  entry:
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %[[#]], i8* align 1 inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_param_tls to i64), i64 8) to i8*), i64 1, i1 false)
+; CHECK:         store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_param_tls, i32 0, i32 0), align 8
+; CHECK:         call void @Fn8(i8* %p)
+; CHECK:         ret void
+;
+entry:
+  call void @Fn8(i8* %p)
+  ret void
+}
+
+define void @ByValForwardNoSanitize8(i32, i8* byval(i8) %p) {
+; CHECK-LABEL: @ByValForwardNoSanitize8(
+; CHECK-NEXT:  entry:
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 1 %[[#]], i8 0, i64 1, i1 false)
+; CHECK:         store i64 0, i64* getelementptr inbounds ([100 x i64], [100 x i64]* @__msan_param_tls, i32 0, i32 0), align 8
+; CHECK:         call void @Fn8(i8* %p)
+; CHECK:         ret void
+;
+entry:
+  call void @Fn8(i8* %p)
+  ret void
+}
+
+define void @ByValForwardByVal8(i32, i8* byval(i8) %p) sanitize_memory {
+; CHECK-LABEL: @ByValForwardByVal8(
+; CHECK-NEXT:  entry:
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* align 1 %[[#]], i8* align 1 inttoptr (i64 add (i64 ptrtoint ([100 x i64]* @__msan_param_tls to i64), i64 8) to i8*), i64 1, i1 false)
+; CHECK:         call void @llvm.memcpy.p0i8.p0i8.i64(i8* bitcast ([100 x i64]* @__msan_param_tls to i8*), i8* %[[#]], i64 1, i1 false)
+; CHECK:         store i32 0, i32* getelementptr inbounds ([200 x i32], [200 x i32]* @__msan_param_origin_tls, i32 0, i32 0), align 4
+; CHECK:         call void @FnByVal8(i8* byval(i8) %p)
+; CHECK:         ret void
+;
+entry:
+  call void @FnByVal8(i8* byval(i8) %p)
+  ret void
+}
+
+; FIXME: Shadow for byval should be reset not copied before the call.
+define void @ByValForwardByValNoSanitize8(i32, i8* byval(i8) %p) {
+; CHECK-LABEL: @ByValForwardByValNoSanitize8(
+; CHECK-NEXT:  entry:
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* align 1 %[[#]], i8 0, i64 1, i1 false)
+; CHECK:         call void @llvm.memset.p0i8.i64(i8* bitcast ([100 x i64]* @__msan_param_tls to i8*), i8 0, i64 1, i1 false)
+; CHECK:         store i32 0, i32* getelementptr inbounds ([200 x i32], [200 x i32]* @__msan_param_origin_tls, i32 0, i32 0), align 4
+; CHECK:         call void @FnByVal8(i8* byval(i8) %p)
+; CHECK:         ret void
+;
+entry:
+  call void @FnByVal8(i8* byval(i8) %p)
+  ret void
+}
+