From 1fdd0f029647fed076696b08646c34e0524042de Mon Sep 17 00:00:00 2001
From: Dan Gohman <dan433584@gmail.com>
Date: Wed, 16 Jan 2019 05:23:52 +0000
Subject: [WebAssembly] COWS has been renamed to WASI.

---
 llvm/include/llvm/ADT/Triple.h    | 10 +++++-----
 llvm/lib/Support/Triple.cpp       |  4 ++--
 llvm/unittests/ADT/TripleTest.cpp | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/llvm/include/llvm/ADT/Triple.h b/llvm/include/llvm/ADT/Triple.h
index b070ae3c97b..e06a68e2731 100644
--- a/llvm/include/llvm/ADT/Triple.h
+++ b/llvm/include/llvm/ADT/Triple.h
@@ -186,8 +186,8 @@ public:
     AMDPAL,     // AMD PAL Runtime
     HermitCore, // HermitCore Unikernel/Multikernel
     Hurd,       // GNU/Hurd
-    COWS,       // Capability-Oriented WebAssembly Syscalls
-    LastOSType = COWS
+    WASI,       // Experimental WebAssembly OS
+    LastOSType = WASI
   };
   enum EnvironmentType {
     UnknownEnvironment,
@@ -588,9 +588,9 @@ public:
     return getOS() == Triple::Hurd;
   }
 
-  /// Tests whether the OS is COWS.
-  bool isOSCOWS() const {
-    return getOS() == Triple::COWS;
+  /// Tests whether the OS is WASI.
+  bool isOSWASI() const {
+    return getOS() == Triple::WASI;
   }
 
   /// Tests whether the OS uses glibc.
diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
index 4ca48dfaeee..26d9327f620 100644
--- a/llvm/lib/Support/Triple.cpp
+++ b/llvm/lib/Support/Triple.cpp
@@ -208,7 +208,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
   case AMDPAL: return "amdpal";
   case HermitCore: return "hermit";
   case Hurd: return "hurd";
-  case COWS: return "cows";
+  case WASI: return "wasi";
   }
 
   llvm_unreachable("Invalid OSType");
@@ -506,7 +506,7 @@ static Triple::OSType parseOS(StringRef OSName) {
     .StartsWith("amdpal", Triple::AMDPAL)
     .StartsWith("hermit", Triple::HermitCore)
     .StartsWith("hurd", Triple::Hurd)
-    .StartsWith("cows", Triple::COWS)
+    .StartsWith("wasi", Triple::WASI)
     .Default(Triple::UnknownOS);
 }
 
diff --git a/llvm/unittests/ADT/TripleTest.cpp b/llvm/unittests/ADT/TripleTest.cpp
index bb31b8b6225..bc7f9321caa 100644
--- a/llvm/unittests/ADT/TripleTest.cpp
+++ b/llvm/unittests/ADT/TripleTest.cpp
@@ -253,10 +253,10 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::UnknownOS, T.getOS());
   EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
 
-  T = Triple("wasm32-unknown-cows-musl");
+  T = Triple("wasm32-unknown-wasi-musl");
   EXPECT_EQ(Triple::wasm32, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::COWS, T.getOS());
+  EXPECT_EQ(Triple::WASI, T.getOS());
   EXPECT_EQ(Triple::Musl, T.getEnvironment());
 
   T = Triple("wasm64-unknown-unknown");
@@ -265,10 +265,10 @@ TEST(TripleTest, ParsedIDs) {
   EXPECT_EQ(Triple::UnknownOS, T.getOS());
   EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
 
-  T = Triple("wasm64-unknown-cows-musl");
+  T = Triple("wasm64-unknown-wasi-musl");
   EXPECT_EQ(Triple::wasm64, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
-  EXPECT_EQ(Triple::COWS, T.getOS());
+  EXPECT_EQ(Triple::WASI, T.getOS());
   EXPECT_EQ(Triple::Musl, T.getEnvironment());
 
   T = Triple("avr-unknown-unknown");
@@ -1247,17 +1247,17 @@ TEST(TripleTest, FileFormat) {
 
   EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-unknown").getObjectFormat());
   EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-unknown").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-cows-musl").getObjectFormat());
-  EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-cows-musl").getObjectFormat());
+  EXPECT_EQ(Triple::Wasm, Triple("wasm32-unknown-wasi-musl").getObjectFormat());
+  EXPECT_EQ(Triple::Wasm, Triple("wasm64-unknown-wasi-musl").getObjectFormat());
 
   EXPECT_EQ(Triple::Wasm,
             Triple("wasm32-unknown-unknown-wasm").getObjectFormat());
   EXPECT_EQ(Triple::Wasm,
             Triple("wasm64-unknown-unknown-wasm").getObjectFormat());
   EXPECT_EQ(Triple::Wasm,
-            Triple("wasm32-unknown-cows-musl-wasm").getObjectFormat());
+            Triple("wasm32-unknown-wasi-musl-wasm").getObjectFormat());
   EXPECT_EQ(Triple::Wasm,
-            Triple("wasm64-unknown-cows-musl-wasm").getObjectFormat());
+            Triple("wasm64-unknown-wasi-musl-wasm").getObjectFormat());
 
   Triple MSVCNormalized(Triple::normalize("i686-pc-windows-msvc-elf"));
   EXPECT_EQ(Triple::ELF, MSVCNormalized.getObjectFormat());
-- 
cgit v1.2.3