Merge commit '07a0b9399e56' from apple/master into swift/master-next

git apple-llvm automerger · git apple-llvm automerger · commit 6ae2d65520d2 · 2020-07-14T11:22:02.000-04:00
diff --git a/llvm/unittests/Support/TargetParserTest.cpp b/llvm/unittests/Support/TargetParserTest.cpp
@@ -1039,7 +1039,7 @@ TEST(TargetParserTest, testAArch64CPU) {
       "8.2-A"));
 }
 
-static constexpr unsigned NumAArch64CPUArchs = 42;
+static constexpr unsigned NumAArch64CPUArchs = 44;
 
 TEST(TargetParserTest, testAArch64CPUArchList) {
   SmallVector<StringRef, NumAArch64CPUArchs> List;

Original file line number	Diff line number	Diff line change
`@@ -1039,7 +1039,7 @@ TEST(TargetParserTest, testAArch64CPU) {`
`1039`	`1039`	`"8.2-A"));`
`1040`	`1040`	`}`
`1041`	`1041`
`1042`		`-static constexpr unsigned NumAArch64CPUArchs = 42;`
	`1042`	`+static constexpr unsigned NumAArch64CPUArchs = 44;`
`1043`	`1043`
`1044`	`1044`	`TEST(TargetParserTest, testAArch64CPUArchList) {`
`1045`	`1045`	`SmallVector<StringRef, NumAArch64CPUArchs> List;`