[cfe-commits] r146254 - in /cfe/trunk: include/clang/Analysis/Analyses/FormatString.h lib/Analysis/FormatString.cpp lib/Analysis/PrintfFormatString.cpp lib/Sema/SemaChecking.cpp test/Sema/format-strings-int-typedefs.c
Ted Kremenek
kremenek at apple.com
Fri Dec 9 12:18:31 PST 2011
Nice!
On Dec 9, 2011, at 4:22 AM, Hans Wennborg wrote:
> Author: hans
> Date: Fri Dec 9 06:22:12 2011
> New Revision: 146254
>
> URL: http://llvm.org/viewvc/llvm-project?rev=146254&view=rev
> Log:
> Make printf warnings refer to wint_t and wchar_t by name
> in addition to underlying type.
>
> Modified:
> cfe/trunk/include/clang/Analysis/Analyses/FormatString.h
> cfe/trunk/lib/Analysis/FormatString.cpp
> cfe/trunk/lib/Analysis/PrintfFormatString.cpp
> cfe/trunk/lib/Sema/SemaChecking.cpp
> cfe/trunk/test/Sema/format-strings-int-typedefs.c
>
> Modified: cfe/trunk/include/clang/Analysis/Analyses/FormatString.h
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Analysis/Analyses/FormatString.h?rev=146254&r1=146253&r2=146254&view=diff
> ==============================================================================
> --- cfe/trunk/include/clang/Analysis/Analyses/FormatString.h (original)
> +++ cfe/trunk/include/clang/Analysis/Analyses/FormatString.h Fri Dec 9 06:22:12 2011
> @@ -199,7 +199,7 @@
> class ArgTypeResult {
> public:
> enum Kind { UnknownTy, InvalidTy, SpecificTy, ObjCPointerTy, CPointerTy,
> - AnyCharTy, CStrTy, WCStrTy, WIntTy, TypedefTy };
> + AnyCharTy, CStrTy, WCStrTy, WIntTy };
> private:
> const Kind K;
> QualType T;
> @@ -207,8 +207,9 @@
> ArgTypeResult(bool) : K(InvalidTy), Name(0) {}
> public:
> ArgTypeResult(Kind k = UnknownTy) : K(k), Name(0) {}
> + ArgTypeResult(Kind k, const char *n) : K(k), Name(n) {}
> ArgTypeResult(QualType t) : K(SpecificTy), T(t), Name(0) {}
> - ArgTypeResult(QualType t, const char *n) : K(TypedefTy), T(t), Name(n) {}
> + ArgTypeResult(QualType t, const char *n) : K(SpecificTy), T(t), Name(n) {}
> ArgTypeResult(CanQualType t) : K(SpecificTy), T(t), Name(0) {}
>
> static ArgTypeResult Invalid() { return ArgTypeResult(true); }
>
> Modified: cfe/trunk/lib/Analysis/FormatString.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/FormatString.cpp?rev=146254&r1=146253&r2=146254&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Analysis/FormatString.cpp (original)
> +++ cfe/trunk/lib/Analysis/FormatString.cpp Fri Dec 9 06:22:12 2011
> @@ -228,7 +228,6 @@
> return false;
> }
>
> - case TypedefTy:
> case SpecificTy: {
> argTy = C.getCanonicalType(argTy).getUnqualifiedType();
> if (T == argTy)
> @@ -332,7 +331,6 @@
> case AnyCharTy:
> return C.CharTy;
> case SpecificTy:
> - case TypedefTy:
> return T;
> case CStrTy:
> return C.getPointerType(C.CharTy);
> @@ -354,9 +352,10 @@
> }
>
> std::string ArgTypeResult::getRepresentativeTypeName(ASTContext &C) const {
> - if (K != TypedefTy)
> - return std::string("'") + getRepresentativeType(C).getAsString() + "'";
> - return std::string("'") + Name + "' (aka '" + T.getAsString() + "')";
> + std::string S = getRepresentativeType(C).getAsString();
> + if (Name)
> + return std::string("'") + Name + "' (aka '" + S + "')";
> + return std::string("'") + S + "'";
> }
>
>
>
> Modified: cfe/trunk/lib/Analysis/PrintfFormatString.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/PrintfFormatString.cpp?rev=146254&r1=146253&r2=146254&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Analysis/PrintfFormatString.cpp (original)
> +++ cfe/trunk/lib/Analysis/PrintfFormatString.cpp Fri Dec 9 06:22:12 2011
> @@ -247,7 +247,8 @@
> if (CS.getKind() == ConversionSpecifier::cArg)
> switch (LM.getKind()) {
> case LengthModifier::None: return Ctx.IntTy;
> - case LengthModifier::AsLong: return ArgTypeResult::WIntTy;
> + case LengthModifier::AsLong:
> + return ArgTypeResult(ArgTypeResult::WIntTy, "wint_t");
> default:
> return ArgTypeResult::Invalid();
> }
> @@ -296,14 +297,16 @@
> }
>
> switch (CS.getKind()) {
> - case ConversionSpecifier::sArg:
> - return ArgTypeResult(LM.getKind() == LengthModifier::AsWideChar ?
> - ArgTypeResult::WCStrTy : ArgTypeResult::CStrTy);
> + case ConversionSpecifier::sArg: {
> + if (LM.getKind() == LengthModifier::AsWideChar)
> + return ArgTypeResult(ArgTypeResult::WCStrTy, "wchar_t *");
> + return ArgTypeResult::CStrTy;
> + }
> case ConversionSpecifier::SArg:
> // FIXME: This appears to be Mac OS X specific.
> - return ArgTypeResult::WCStrTy;
> + return ArgTypeResult(ArgTypeResult::WCStrTy, "wchar_t *");
> case ConversionSpecifier::CArg:
> - return Ctx.WCharTy;
> + return ArgTypeResult(Ctx.WCharTy, "wchar_t");
> case ConversionSpecifier::pArg:
> return ArgTypeResult::CPointerTy;
> default:
>
> Modified: cfe/trunk/lib/Sema/SemaChecking.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaChecking.cpp?rev=146254&r1=146253&r2=146254&view=diff
> ==============================================================================
> --- cfe/trunk/lib/Sema/SemaChecking.cpp (original)
> +++ cfe/trunk/lib/Sema/SemaChecking.cpp Fri Dec 9 06:22:12 2011
> @@ -2229,9 +2229,6 @@
> llvm::raw_svector_ostream os(buf);
> fixedFS.toString(os);
>
> - // FIXME: getRepresentativeType() perhaps should return a string
> - // instead of a QualType to better handle when the representative
> - // type is 'wint_t' (which is defined in the system headers).
> EmitFormatDiagnostic(
> S.PDiag(diag::warn_printf_conversion_argument_type_mismatch)
> << ATR.getRepresentativeTypeName(S.Context) << Ex->getType()
>
> Modified: cfe/trunk/test/Sema/format-strings-int-typedefs.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/format-strings-int-typedefs.c?rev=146254&r1=146253&r2=146254&view=diff
> ==============================================================================
> --- cfe/trunk/test/Sema/format-strings-int-typedefs.c (original)
> +++ cfe/trunk/test/Sema/format-strings-int-typedefs.c Fri Dec 9 06:22:12 2011
> @@ -7,6 +7,11 @@
> printf("%ju", 42.0); // expected-warning {{conversion specifies type 'uintmax_t' (aka 'unsigned long long')}}
> printf("%zu", 42.0); // expected-warning {{conversion specifies type 'size_t' (aka 'unsigned long')}}
> printf("%td", 42.0); // expected-warning {{conversion specifies type 'ptrdiff_t' (aka 'int')}}
> + printf("%lc", 42.0); // expected-warning {{conversion specifies type 'wint_t' (aka 'int')}}
> + printf("%ls", 42.0); // expected-warning {{conversion specifies type 'wchar_t *' (aka 'int *')}}
> + printf("%S", 42.0); // expected-warning {{conversion specifies type 'wchar_t *' (aka 'int *')}}
> + printf("%C", 42.0); // expected-warning {{conversion specifies type 'wchar_t' (aka 'int')}}
> +
>
> // typedef size_t et al. to something crazy.
> typedef void *size_t;
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list