Commit e916c8df authored by Nico Weber's avatar Nico Weber
Browse files

Revert "[Clang] Warn about 'z' printf modifier in old MSVC." 

This reverts commit fe0d1b6a.
Makes Analysis/taint-generic.c fail on some Windows systems.
parent 4b414d9a

clang/lib/AST/FormatString.cpp

+0 −9
Original line number Diff line number Diff line
@@ -748,15 +748,6 @@ bool FormatSpecifier::hasValidLengthModifier(const TargetInfo &Target, 
    case LengthModifier::AsIntMax:

    case LengthModifier::AsSizeT:

    case LengthModifier::AsPtrDiff:

      if (LM.getKind() == LengthModifier::AsSizeT &&

          Target.getTriple().isOSMSVCRT() &&

          !LO.isCompatibleWithMSVC(LangOptions::MSVC2015)) {

        // The standard libraries before MSVC2015 didn't support the 'z' length

        // modifier for size_t. So if the MS compatibility version is less than

        // that, reject.

        return false;

      }



      switch (CS.getKind()) {

        case ConversionSpecifier::dArg:

        case ConversionSpecifier::DArg:

clang/test/Sema/format-strings-ms.c

+0 −9
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 %s

// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 -fms-compatibility-version=18 %s

// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 -fms-compatibility-version=19 -DSIZE_T_OK %s

// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 -Wformat-non-iso -DNON_ISO_WARNING %s



int printf(const char *format, ...) __attribute__((format(printf, 1, 2)));
@@ -87,11 +85,4 @@ void z_test(void *p) { 
  scanf("%Z", p); // expected-warning{{invalid conversion specifier 'Z'}}

}



void size_t_test(size_t s) {

  printf("%zu", s);

#ifndef SIZE_T_OK

  // expected-warning@-2 {{length modifier 'z' results in undefined behavior or no effect with 'u' conversion specifier}}

#endif

}



#endif