Date: Wed, 13 Oct 2010 14:27:47 +0000 (UTC) From: Roman Divacky <rdivacky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213777 - head/contrib/llvm/tools/clang/lib/Sema Message-ID: <201010131427.o9DERm1Z090174@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rdivacky Date: Wed Oct 13 14:27:47 2010 New Revision: 213777 URL: http://svn.freebsd.org/changeset/base/213777 Log: Extend this check for const unsigned char *. Approved by: rpaulo (mentor) Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp Modified: head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp ============================================================================== --- head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp Wed Oct 13 14:02:45 2010 (r213776) +++ head/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp Wed Oct 13 14:27:47 2010 (r213777) @@ -1519,10 +1519,14 @@ CheckPrintfHandler::HandlePrintfSpecifie // Now type check the data expression that matches the // format specifier. const Expr *Ex = getDataArg(argIndex); + QualType Pointee = S.Context.UnsignedCharTy; + Pointee.addConst(); + QualType constType = (CS.getKind() == ConversionSpecifier::bArg) ? S.Context.IntTy : S.Context.getPointerType(Pointee); QualType type = (CS.getKind() == ConversionSpecifier::bArg) ? S.Context.IntTy : S.Context.getPointerType(S.Context.UnsignedCharTy); - //const analyze_printf::ArgTypeResult &ATR = S.Context.IntTy; + const analyze_printf::ArgTypeResult &ConstATR = constType; const analyze_printf::ArgTypeResult &ATR = type; - if (ATR.isValid() && !ATR.matchesType(S.Context, Ex->getType())) + if (ATR.isValid() && !ATR.matchesType(S.Context, Ex->getType()) && + !ConstATR.matchesType(S.Context, Ex->getType())) S.Diag(getLocationOfByte(CS.getStart()), diag::warn_printf_conversion_argument_type_mismatch) << ATR.getRepresentativeType(S.Context) << Ex->getType()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010131427.o9DERm1Z090174>