Merge commit '9e7368888ec3' from apple/master into swift/master-next

git apple-llvm automerger · git apple-llvm automerger · commit ec00c54a9fbf · 2020-07-17T20:57:45.000+01:00
diff --git a/llvm/test/Transforms/InstCombine/shift-amount-reassociation-with-truncation-shl.ll b/llvm/test/Transforms/InstCombine/shift-amount-reassociation-with-truncation-shl.ll
@@ -194,7 +194,7 @@ define i16 @n11(i32 %x, i16 %y) {
   ret i16 %t5
 }
 
-; Bit width mismatch of shit amount
+; Bit width mismatch of shift amount
 
 @Y32 = global i32 42
 @Y16 = global i16 42

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ define i16 @n11(i32 %x, i16 %y) {`
`194`	`194`	`ret i16 %t5`
`195`	`195`	`}`
`196`	`196`
`197`		`-; Bit width mismatch of shit amount`
	`197`	`+; Bit width mismatch of shift amount`
`198`	`198`
`199`	`199`	`@Y32 = global i32 42`
`200`	`200`	`@Y16 = global i16 42`