From owner-svn-src-projects@FreeBSD.ORG Fri Apr 23 16:15:01 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC54C1065670; Fri, 23 Apr 2010 16:15:01 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (lev.vlakno.cz [77.93.215.190]) by mx1.freebsd.org (Postfix) with ESMTP id 5B8F88FC16; Fri, 23 Apr 2010 16:15:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 23AA19CB0F6; Fri, 23 Apr 2010 18:12:32 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (lev.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eZMI3Ms5Rzds; Fri, 23 Apr 2010 18:12:29 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id AEBD19CB111; Fri, 23 Apr 2010 18:12:29 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.14.3/8.14.3/Submit) id o3NGCTUW060497; Fri, 23 Apr 2010 18:12:29 +0200 (CEST) (envelope-from rdivacky) Date: Fri, 23 Apr 2010 18:12:29 +0200 From: Roman Divacky To: src-committers@freebsd.org, svn-src-projects@freebsd.org Message-ID: <20100423161229.GA60296@freebsd.org> References: <201004231613.o3NGDAB9048580@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201004231613.o3NGDAB9048580@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i Cc: Subject: Re: svn commit: r207121 - in projects/clangbsd/contrib/llvm/tools/clang: include/clang/Analysis/Analyses lib/Analysis lib/Sema X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Apr 2010 16:15:01 -0000 for those interested in reviewing this. this testcase: http://vlakno.cz/~rdivacky/kprintf.c produces these warnings: http://vlakno.cz/~rdivacky/kprintf.txt On Fri, Apr 23, 2010 at 04:13:10PM +0000, Roman Divacky wrote: > Author: rdivacky > Date: Fri Apr 23 16:13:09 2010 > New Revision: 207121 > URL: http://svn.freebsd.org/changeset/base/207121 > > Log: > Implement FreeBSD printf modifiers - b/D/r > > Requested by: kmacy > > Modified: > projects/clangbsd/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PrintfFormatString.h > projects/clangbsd/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp > projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp > > Modified: projects/clangbsd/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PrintfFormatString.h > ============================================================================== > --- projects/clangbsd/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PrintfFormatString.h Fri Apr 23 15:51:13 2010 (r207120) > +++ projects/clangbsd/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PrintfFormatString.h Fri Apr 23 16:13:09 2010 (r207121) > @@ -57,6 +57,7 @@ public: > InvalidSpecifier = 0, > // C99 conversion specifiers. > dArg, // 'd' > + DArg, // 'D' FreeBSD specific specifiers > iArg, // 'i', > oArg, // 'o', > uArg, // 'u', > @@ -82,6 +83,7 @@ public: > ObjCObjArg, // '@' > // GlibC specific specifiers. > PrintErrno, // 'm' > + bArg, // FreeBSD specific specifiers > // Specifier ranges. > IntArgBeg = dArg, > IntArgEnd = iArg, > > Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp > ============================================================================== > --- projects/clangbsd/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp Fri Apr 23 15:51:13 2010 (r207120) > +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp Fri Apr 23 16:13:09 2010 (r207121) > @@ -369,11 +369,18 @@ static FormatSpecifierResult ParseFormat > case '@': k = ConversionSpecifier::ObjCObjArg; break; > // Glibc specific. > case 'm': k = ConversionSpecifier::PrintErrno; break; > + // FreeBSD format extensions > + case 'b': k = ConversionSpecifier::bArg; break; /* check for int and then char * */ > + case 'r': k = ConversionSpecifier::xArg; break; > + case 'D': k = ConversionSpecifier::DArg; break; /* check for u_char * pointer and a char * string */ > } > ConversionSpecifier CS(conversionPosition, k); > FS.setConversionSpecifier(CS); > if (CS.consumesDataArgument() && !FS.usesPositionalArg()) > FS.setArgIndex(argIndex++); > + // FreeBSD extension > + if (k == ConversionSpecifier::bArg || k == ConversionSpecifier::DArg) > + argIndex++; > > if (k == ConversionSpecifier::InvalidSpecifier) { > // Assume the conversion takes one argument. > > Modified: projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp > ============================================================================== > --- projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp Fri Apr 23 15:51:13 2010 (r207120) > +++ projects/clangbsd/contrib/llvm/tools/clang/lib/Sema/SemaChecking.cpp Fri Apr 23 16:13:09 2010 (r207121) > @@ -1273,6 +1273,39 @@ CheckPrintfHandler::HandleFormatSpecifie > CoveredArgs.set(argIndex); > } > > + // FreeBSD extensions > + if (CS.getKind() == ConversionSpecifier::bArg || CS.getKind() == ConversionSpecifier::DArg) { > + // claim the second argument > + CoveredArgs.set(argIndex + 1); > + > + // Now type check the data expression that matches the > + // format specifier. > + const Expr *Ex = getDataArg(argIndex); > + 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 &ATR = type; > + if (ATR.isValid() && !ATR.matchesType(S.Context, Ex->getType())) > + S.Diag(getLocationOfByte(CS.getStart()), > + diag::warn_printf_conversion_argument_type_mismatch) > + << ATR.getRepresentativeType(S.Context) << Ex->getType() > + << getFormatSpecifierRange(startSpecifier, specifierLen) > + << Ex->getSourceRange(); > + > + // Now type check the data expression that matches the > + // format specifier. > + Ex = getDataArg(argIndex + 1); > + const analyze_printf::ArgTypeResult &ATR2 = ArgTypeResult::CStrTy; > + if (ATR2.isValid() && !ATR2.matchesType(S.Context, Ex->getType())) > + S.Diag(getLocationOfByte(CS.getStart()), > + diag::warn_printf_conversion_argument_type_mismatch) > + << ATR2.getRepresentativeType(S.Context) << Ex->getType() > + << getFormatSpecifierRange(startSpecifier, specifierLen) > + << Ex->getSourceRange(); > + > + return true; > + } > + // END OF FREEBSD EXTENSIONS > + > // Check for using an Objective-C specific conversion specifier > // in a non-ObjC literal. > if (!IsObjCLiteral && CS.isObjCArg()) {