From: Aaron Ballman <aaron@aaronballman.com>
Date: Tue, 11 Dec 2018 19:42:04 +0000 (+0000)
Subject: Revert r348889; it fails some tests.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e11b388474b7f40545afbeb6b3335f09bff65a6c;p=clang

Revert r348889; it fails some tests.

http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/40784

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@348892 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp
index b54bcd8e05..9fed4761b9 100644
--- a/lib/Sema/SemaChecking.cpp
+++ b/lib/Sema/SemaChecking.cpp
@@ -7709,24 +7709,6 @@ shouldNotPrintDirectly(const ASTContext &Context,
   return std::make_pair(QualType(), StringRef());
 }
 
-/// Return true if \p ICE is an implicit argument promotion of an arithmetic
-/// type. Bit-field 'promotions' from a higher ranked type to a lower ranked
-/// type do not count.
-static bool
-isArithmeticArgumentPromotion(Sema &S, const ImplicitCastExpr *ICE) {
-  QualType From = ICE->getSubExpr()->getType();
-  QualType To = ICE->getType();
-  // It's a floating promotion if the source type is a lower rank.
-  if (ICE->getCastKind() == CK_FloatingCast &&
-      S.Context.getFloatingTypeOrder(From, To) < 0)
-    return true;
-  // It's an integer promotion if the destination type is the promoted
-  // source type.
-  return ICE->getCastKind() == CK_IntegralCast &&
-         From->isPromotableIntegerType() &&
-         S.Context.getPromotedIntegerType(From) == To;
-}
-
 bool
 CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
                                     const char *StartSpecifier,
@@ -7754,11 +7736,11 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
 
   // Look through argument promotions for our error message's reported type.
   // This includes the integral and floating promotions, but excludes array
-  // and function pointer decay (seeing that an argument intended to be a
-  // string has type 'char [6]' is probably more confusing than 'char *') and
-  // certain bitfield promotions (bitfields can be 'demoted' to a lesser type).
+  // and function pointer decay; seeing that an argument intended to be a
+  // string has type 'char [6]' is probably more confusing than 'char *'.
   if (const ImplicitCastExpr *ICE = dyn_cast<ImplicitCastExpr>(E)) {
-    if (isArithmeticArgumentPromotion(S, ICE)) {
+    if (ICE->getCastKind() == CK_IntegralCast ||
+        ICE->getCastKind() == CK_FloatingCast) {
       E = ICE->getSubExpr();
       ExprTy = E->getType();
 
diff --git a/test/Sema/format-strings-bitfield-promotion.c b/test/Sema/format-strings-bitfield-promotion.c
deleted file mode 100644
index cbe00e7510..0000000000
--- a/test/Sema/format-strings-bitfield-promotion.c
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify %s
-// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fsyntax-only -verify %s
-
-int printf(const char *restrict, ...);
-
-struct bitfields {
-  long a : 2;
-  unsigned long b : 2;
-  long c : 32;          // assumes that int is 32 bits
-  unsigned long d : 32; // assumes that int is 32 bits
-} bf;
-
-void bitfield_promotion() {
-  printf("%ld", bf.a); // expected-warning {{format specifies type 'long' but the argument has type 'int'}}
-  printf("%lu", bf.b); // expected-warning {{format specifies type 'unsigned long' but the argument has type 'int'}}
-  printf("%ld", bf.c); // expected-warning {{format specifies type 'long' but the argument has type 'int'}}
-  printf("%lu", bf.d); // expected-warning {{format specifies type 'unsigned long' but the argument has type 'unsigned int'}}
-}
diff --git a/test/Sema/format-strings-bitfield-promotion.cxx b/test/Sema/format-strings-bitfield-promotion.cxx
deleted file mode 100644
index 2309e98066..0000000000
--- a/test/Sema/format-strings-bitfield-promotion.cxx
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: %clang_cc1 -triple x86_64-unknown-unknown -fsyntax-only -verify %s
-// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fsyntax-only -verify %s
-
-// In C++, the bitfield promotion from long to int does not occur, unlike C.
-// expected-no-diagnostics
-
-int printf(const char *restrict, ...);
-
-struct bitfields {
-  long a : 2;
-  unsigned long b : 2;
-  long c : 32;          // assumes that int is 32 bits
-  unsigned long d : 32; // assumes that int is 32 bits
-} bf;
-
-void bitfield_promotion() {
-  printf("%ld", bf.a);
-  printf("%lu", bf.b);
-  printf("%ld", bf.c);
-  printf("%lu", bf.d);
-}