Author: aaronballman Date: Tue Dec 11 11:42:04 2018 New Revision: 348892 URL: http://llvm.org/viewvc/llvm-project?rev=348892&view=rev Log: Revert r348889; it fails some tests.
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/40784 Removed: cfe/trunk/test/Sema/format-strings-bitfield-promotion.c cfe/trunk/test/Sema/format-strings-bitfield-promotion.cxx Modified: cfe/trunk/lib/Sema/SemaChecking.cpp Modified: cfe/trunk/lib/Sema/SemaChecking.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=348892&r1=348891&r2=348892&view=diff ============================================================================== --- cfe/trunk/lib/Sema/SemaChecking.cpp (original) +++ cfe/trunk/lib/Sema/SemaChecking.cpp Tue Dec 11 11:42:04 2018 @@ -7709,24 +7709,6 @@ shouldNotPrintDirectly(const ASTContext 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(cons // 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(); Removed: cfe/trunk/test/Sema/format-strings-bitfield-promotion.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings-bitfield-promotion.c?rev=348891&view=auto ============================================================================== --- cfe/trunk/test/Sema/format-strings-bitfield-promotion.c (original) +++ cfe/trunk/test/Sema/format-strings-bitfield-promotion.c (removed) @@ -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'}} -} Removed: cfe/trunk/test/Sema/format-strings-bitfield-promotion.cxx URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings-bitfield-promotion.cxx?rev=348891&view=auto ============================================================================== --- cfe/trunk/test/Sema/format-strings-bitfield-promotion.cxx (original) +++ cfe/trunk/test/Sema/format-strings-bitfield-promotion.cxx (removed) @@ -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); -} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
