From 11309e17913197d3dce34af67b945e9d1cc79c86 Mon Sep 17 00:00:00 2001
From: Jacob Gravelle <jgravelle@google.com>
Date: Tue, 30 Aug 2016 11:25:13 -0700
Subject: [PATCH 1/2] Modify AsmJS SizeType to match Wasm

AsmJS uses unsigned ints for size_t, which causes some libcxx functions
to have different symbols in AsmJS than with Wasm, which uses unsigned
longs.
In principle we want AsmJS and Wasm to have the same ABI, so this serves
as a first step toward ensuring that they match.
---
 lib/Basic/Targets.cpp         |  3 ---
 test/Frontend/asmjs-types.cpp | 42 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 test/Frontend/asmjs-types.cpp

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 7730513ac70..311a03c23b8 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -7685,9 +7685,6 @@ class AsmJSTargetInfo : public TargetInfo {
     IntMaxType = Int64Type = TargetInfo::SignedLongLong;
     DoubleAlign = 64;
     LongDoubleWidth = LongDoubleAlign = 64;
-    SizeType = TargetInfo::UnsignedInt;
-    PtrDiffType = TargetInfo::SignedInt;
-    IntPtrType = TargetInfo::SignedInt;
     RegParmMax = 0; // Disallow regparm
 
     // Set the native integer widths set to just i32, since that's currently the
diff --git a/test/Frontend/asmjs-types.cpp b/test/Frontend/asmjs-types.cpp
new file mode 100644
index 00000000000..75afcb2cd10
--- /dev/null
+++ b/test/Frontend/asmjs-types.cpp
@@ -0,0 +1,42 @@
+// RUN: %clang_cc1 -triple asmjs-unknown-emscripten -std=c++11 -verify %s
+// expected-no-diagnostics
+
+#include <stddef.h>
+#include <stdarg.h>
+
+template <typename T, typename U> struct is_same { static const bool value = false; };
+template <typename T> struct is_same<T, T> { static const bool value = true; };
+
+static_assert(is_same<__SIZE_TYPE__, unsigned long>::value, "__SIZE_TYPE__ should be unsigned long");
+
+static_assert(alignof(char) == 1, "alignof char should be 1");
+
+static_assert(sizeof(short) == 2, "sizeof short should be 2");
+static_assert(alignof(short) == 2, "alignof short should be 2");
+
+static_assert(sizeof(int) == 4, "sizeof int should be 4");
+static_assert(alignof(int) == 4, "alignof int should be 4");
+
+static_assert(sizeof(long) == 4, "sizeof long should be 4");
+static_assert(alignof(long) == 4, "alignof long should be 4");
+
+static_assert(sizeof(long long) == 8, "sizeof long long should be 8");
+static_assert(alignof(long long) == 8, "alignof long long should be 8");
+
+static_assert(sizeof(void*) == 4, "sizeof void * should be 4");
+static_assert(alignof(void*) == 4, "alignof void * should be 4");
+
+static_assert(sizeof(float) == 4, "sizeof float should be 4");
+static_assert(alignof(float) == 4, "alignof float should be 4");
+
+static_assert(sizeof(double) == 8, "sizeof double should be 8");
+static_assert(alignof(double) == 8, "alignof double should be 8");
+
+static_assert(sizeof(long double) == 8, "sizeof long double should be 8");
+static_assert(alignof(long double) == 8, "alignof long double should be 8");
+
+static_assert(sizeof(va_list) == 16, "sizeof va_list should be 16");
+static_assert(alignof(va_list) == 4, "alignof va_list should be 4");
+
+static_assert(sizeof(size_t) == 4, "sizeof size_t should be 4");
+static_assert(alignof(size_t) == 4, "alignof size_t should be 4");

From 604c8c1da5a7e986ef67212c2999d10961b02a56 Mon Sep 17 00:00:00 2001
From: Jacob Gravelle <jgravelle@google.com>
Date: Tue, 30 Aug 2016 11:32:39 -0700
Subject: [PATCH 2/2] Add "override" to silence some compiler warnings

---
 lib/Basic/Targets.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index 311a03c23b8..bb5c563fbf6 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -7707,10 +7707,10 @@ class AsmJSTargetInfo : public TargetInfo {
     // Reuse PNaCl's va_list lowering.
     return TargetInfo::PNaClABIBuiltinVaList;
   }
-  ArrayRef<const char *> getGCCRegNames() const {
+  ArrayRef<const char *> getGCCRegNames() const override {
     return None;
   }
-  ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const {
+  ArrayRef<TargetInfo::GCCRegAlias> getGCCRegAliases() const override {
     return None;
   }
   bool validateAsmConstraint(const char *&Name,