diff --git a/lib/Analysis/FormatString.cpp b/lib/Analysis/FormatString.cpp
index f37e4affae..0bab50c569 100644
--- a/lib/Analysis/FormatString.cpp
+++ b/lib/Analysis/FormatString.cpp
@@ -406,12 +406,14 @@ ArgType::matchesType(ASTContext &C, QualType argTy) const {
     }
 
     case WIntTy: {
-
-      QualType PromoArg =
-        argTy->isPromotableIntegerType()
-          ? C.getPromotedIntegerType(argTy) : argTy;
-
       QualType WInt = C.getCanonicalType(C.getWIntType()).getUnqualifiedType();
+
+      if (C.getCanonicalType(argTy).getUnqualifiedType() == WInt)
+        return Match;
+
+      QualType PromoArg = argTy->isPromotableIntegerType()
+                              ? C.getPromotedIntegerType(argTy)
+                              : argTy;
       PromoArg = C.getCanonicalType(PromoArg).getUnqualifiedType();
 
       // If the promoted argument is the corresponding signed type of the
diff --git a/test/Sema/format-strings-ms.c b/test/Sema/format-strings-ms.c
index 9887b461f6..56a349051d 100644
--- a/test/Sema/format-strings-ms.c
+++ b/test/Sema/format-strings-ms.c
@@ -13,7 +13,6 @@ void non_iso_warning_test(__int32 i32, __int64 i64, wchar_t c, void *p) {
   printf("%I32d", i32); // expected-warning{{'I32' length modifier is not supported by ISO C}}
   printf("%I64d", i64); // expected-warning{{'I64' length modifier is not supported by ISO C}}
   printf("%wc", c); // expected-warning{{'w' length modifier is not supported by ISO C}}
-  // expected-warning@-1{{format specifies type 'wint_t' (aka 'unsigned short') but the argument has type 'wchar_t' (aka 'unsigned short')}}
   printf("%Z", p); // expected-warning{{'Z' conversion specifier is not supported by ISO C}}
 }
 
@@ -36,7 +35,7 @@ void unsigned_test() {
 }
 
 void w_test(wchar_t c, wchar_t *s) {
-  printf("%wc", c); // expected-warning{{format specifies type 'wint_t' (aka 'unsigned short') but the argument has type 'wchar_t' (aka 'unsigned short')}}
+  printf("%wc", c);
   printf("%wC", c);
   printf("%C", c);
   printf("%ws", s);
diff --git a/test/Sema/format-strings.c b/test/Sema/format-strings.c
index 54651226ad..6630acdbc2 100644
--- a/test/Sema/format-strings.c
+++ b/test/Sema/format-strings.c
@@ -401,7 +401,11 @@ void bug7377_bad_length_mod_usage() {
 void pr7981(wint_t c, wchar_t c2) {
   printf("%lc", c); // no-warning
   printf("%lc", 1.0); // expected-warning{{the argument has type 'double'}}
+#if __WINT_WIDTH__ == 4
   printf("%lc", (char) 1); // no-warning
+#else
+  printf("%lc", (char) 1); // expected-warning{{the argument has type 'char'}}
+#endif
   printf("%lc", &c); // expected-warning{{the argument has type 'wint_t *'}}
   // If wint_t and wchar_t are the same width and wint_t is signed where
   // wchar_t is unsigned, an implicit conversion isn't possible.