Merge commit 'b3cb334ff58c' from swift/release/5.3 into swift/master

Author: git apple-llvm automerger

llvm/lib/Support/Triple.cpp

@@ -1069,12 +1069,6 @@ void Triple::getOSVersion(unsigned &Major, unsigned &Minor,
     OSName.consume_front("macos");
 
   parseVersionFromName(OSName, Major, Minor, Micro);
-  if (getOS() == MacOSX && Major == 10 && Minor == 16 && Micro == 0) {
-    // macOS 10.16 is canonicalized to macOS 11.
-    Major = 11;
-    Minor = 0;
-    Micro = 0;
-  }
 }
 
 bool Triple::getMacOSXVersion(unsigned &Major, unsigned &Minor,

llvm/unittests/ADT/TripleTest.cpp

@@ -1235,8 +1235,8 @@ TEST(TripleTest, getOSVersion) {
   T = Triple("x86_64-apple-macos10.16");
   EXPECT_TRUE(T.isMacOSX());
   T.getMacOSXVersion(Major, Minor, Micro);
-  EXPECT_EQ((unsigned)11, Major);
-  EXPECT_EQ((unsigned)0, Minor);
+  EXPECT_EQ((unsigned)10, Major);
+  EXPECT_EQ((unsigned)16, Minor);
   EXPECT_EQ((unsigned)0, Micro);
 
   T = Triple("x86_64-apple-darwin20");