<div class="gmail_quote">On Wed, Jun 6, 2012 at 10:32 AM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: d0k<br>
Date: Wed Jun 6 12:32:50 2012<br>
New Revision: 158086<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=158086&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=158086&view=rev</a><br>
Log:<br>
Remove unused private member variables found by clang's new -Wunused-private-field.<br></blockquote><div><br></div><div>Wow that found a lot of cruft! Nice!</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
cfe/trunk/include/clang/Sema/Designator.h<br>
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h<br>
cfe/trunk/lib/ARCMigrate/ARCMT.cpp<br>
cfe/trunk/lib/ARCMigrate/TransBlockObjCVariable.cpp<br>
cfe/trunk/lib/ARCMigrate/TransGCCalls.cpp<br>
cfe/trunk/lib/Analysis/CallGraph.cpp<br>
cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp<br>
cfe/trunk/lib/CodeGen/CodeGenTBAA.h<br>
cfe/trunk/lib/Parse/ParsePragma.h<br>
cfe/trunk/lib/Parse/Parser.cpp<br>
cfe/trunk/lib/Sema/SemaStmt.cpp<br>
cfe/trunk/lib/Serialization/ASTReader.cpp<br>
cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
cfe/trunk/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp<br>
cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp<br>
cfe/trunk/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp<br>
cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Sema/Designator.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Designator.h?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Designator.h?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Sema/Designator.h (original)<br>
+++ cfe/trunk/include/clang/Sema/Designator.h Wed Jun 6 12:32:50 2012<br>
@@ -179,18 +179,10 @@<br>
/// Designation - Represent a full designation, which is a sequence of<br>
/// designators. This class is mostly a helper for InitListDesignations.<br>
class Designation {<br>
- /// InitIndex - The index of the initializer expression this is for. For<br>
- /// example, if the initializer were "{ A, .foo=B, C }" a Designation would<br>
- /// exist with InitIndex=1, because element #1 has a designation.<br>
- unsigned InitIndex;<br>
-<br>
/// Designators - The actual designators for this initializer.<br>
SmallVector<Designator, 2> Designators;<br>
<br>
- Designation(unsigned Idx) : InitIndex(Idx) {}<br>
public:<br>
- Designation() : InitIndex(4000) {}<br>
-<br>
/// AddDesignator - Add a designator to the end of this list.<br>
void AddDesignator(Designator D) {<br>
Designators.push_back(D);<br>
<br>
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h (original)<br>
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h Wed Jun 6 12:32:50 2012<br>
@@ -41,8 +41,6 @@<br>
<br>
CheckerManager *CheckerMgr;<br>
<br>
- enum AnalysisScope { ScopeTU, ScopeDecl } AScope;<br>
-<br>
/// \brief The maximum number of exploded nodes the analyzer will generate.<br>
unsigned MaxNodes;<br>
<br>
<br>
Modified: cfe/trunk/lib/ARCMigrate/ARCMT.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ARCMT.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/ARCMT.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/ARCMigrate/ARCMT.cpp (original)<br>
+++ cfe/trunk/lib/ARCMigrate/ARCMT.cpp Wed Jun 6 12:32:50 2012<br>
@@ -480,13 +480,12 @@<br>
<br>
class RewritesApplicator : public TransformActions::RewriteReceiver {<br>
Rewriter &rewriter;<br>
- ASTContext &Ctx;<br>
MigrationProcess::RewriteListener *Listener;<br>
<br>
public:<br>
RewritesApplicator(Rewriter &rewriter, ASTContext &ctx,<br>
MigrationProcess::RewriteListener *listener)<br>
- : rewriter(rewriter), Ctx(ctx), Listener(listener) {<br>
+ : rewriter(rewriter), Listener(listener) {<br>
if (Listener)<br>
Listener->start(ctx);<br>
}<br>
<br>
Modified: cfe/trunk/lib/ARCMigrate/TransBlockObjCVariable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransBlockObjCVariable.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransBlockObjCVariable.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/ARCMigrate/TransBlockObjCVariable.cpp (original)<br>
+++ cfe/trunk/lib/ARCMigrate/TransBlockObjCVariable.cpp Wed Jun 6 12:32:50 2012<br>
@@ -37,7 +37,6 @@<br>
<br>
class RootBlockObjCVarRewriter :<br>
public RecursiveASTVisitor<RootBlockObjCVarRewriter> {<br>
- MigrationPass &Pass;<br>
llvm::DenseSet<VarDecl *> &VarsToChange;<br>
<br>
class BlockVarChecker : public RecursiveASTVisitor<BlockVarChecker> {<br>
@@ -71,9 +70,8 @@<br>
};<br>
<br>
public:<br>
- RootBlockObjCVarRewriter(MigrationPass &pass,<br>
- llvm::DenseSet<VarDecl *> &VarsToChange)<br>
- : Pass(pass), VarsToChange(VarsToChange) { }<br>
+ RootBlockObjCVarRewriter(llvm::DenseSet<VarDecl *> &VarsToChange)<br>
+ : VarsToChange(VarsToChange) { }<br>
<br>
bool VisitBlockDecl(BlockDecl *block) {<br>
SmallVector<VarDecl *, 4> BlockVars;<br>
@@ -120,7 +118,7 @@<br>
: Pass(pass), VarsToChange(VarsToChange) { }<br>
<br>
bool TraverseBlockDecl(BlockDecl *block) {<br>
- RootBlockObjCVarRewriter(Pass, VarsToChange).TraverseDecl(block);<br>
+ RootBlockObjCVarRewriter(VarsToChange).TraverseDecl(block);<br>
return true;<br>
}<br>
};<br>
<br>
Modified: cfe/trunk/lib/ARCMigrate/TransGCCalls.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransGCCalls.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/TransGCCalls.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/ARCMigrate/TransGCCalls.cpp (original)<br>
+++ cfe/trunk/lib/ARCMigrate/TransGCCalls.cpp Wed Jun 6 12:32:50 2012<br>
@@ -20,13 +20,12 @@<br>
class GCCollectableCallsChecker :<br>
public RecursiveASTVisitor<GCCollectableCallsChecker> {<br>
MigrationContext &MigrateCtx;<br>
- ParentMap &PMap;<br>
IdentifierInfo *NSMakeCollectableII;<br>
IdentifierInfo *CFMakeCollectableII;<br>
<br>
public:<br>
- GCCollectableCallsChecker(MigrationContext &ctx, ParentMap &map)<br>
- : MigrateCtx(ctx), PMap(map) {<br>
+ GCCollectableCallsChecker(MigrationContext &ctx)<br>
+ : MigrateCtx(ctx) {<br>
IdentifierTable &Ids = MigrateCtx.Pass.Ctx.Idents;<br>
NSMakeCollectableII = &Ids.get("NSMakeCollectable");<br>
CFMakeCollectableII = &Ids.get("CFMakeCollectable");<br>
@@ -78,7 +77,6 @@<br>
} // anonymous namespace<br>
<br>
void GCCollectableCallsTraverser::traverseBody(BodyContext &BodyCtx) {<br>
- GCCollectableCallsChecker(BodyCtx.getMigrationContext(),<br>
- BodyCtx.getParentMap())<br>
+ GCCollectableCallsChecker(BodyCtx.getMigrationContext())<br>
.TraverseStmt(BodyCtx.getTopStmt());<br>
}<br>
<br>
Modified: cfe/trunk/lib/Analysis/CallGraph.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CallGraph.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/CallGraph.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Analysis/CallGraph.cpp (original)<br>
+++ cfe/trunk/lib/Analysis/CallGraph.cpp Wed Jun 6 12:32:50 2012<br>
@@ -25,12 +25,11 @@<br>
/// given function body.<br>
class CGBuilder : public StmtVisitor<CGBuilder> {<br>
CallGraph *G;<br>
- const Decl *FD;<br>
CallGraphNode *CallerNode;<br>
<br>
public:<br>
- CGBuilder(CallGraph *g, const Decl *D, CallGraphNode *N)<br>
- : G(g), FD(D), CallerNode(N) {}<br>
+ CGBuilder(CallGraph *g, CallGraphNode *N)<br>
+ : G(g), CallerNode(N) {}<br>
<br>
void VisitStmt(Stmt *S) { VisitChildren(S); }<br>
<br>
@@ -99,7 +98,7 @@<br>
Root->addCallee(Node, this);<br>
<br>
// Process all the calls by this function as well.<br>
- CGBuilder builder(this, D, Node);<br>
+ CGBuilder builder(this, Node);<br>
if (Stmt *Body = D->getBody())<br>
builder.Visit(Body);<br>
}<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenTBAA.cpp Wed Jun 6 12:32:50 2012<br>
@@ -29,8 +29,7 @@<br>
CodeGenTBAA::CodeGenTBAA(ASTContext &Ctx, llvm::LLVMContext& VMContext,<br>
const CodeGenOptions &CGO,<br>
const LangOptions &Features, MangleContext &MContext)<br>
- : Context(Ctx), VMContext(VMContext), CodeGenOpts(CGO),<br>
- Features(Features), MContext(MContext),<br>
+ : Context(Ctx), CodeGenOpts(CGO), Features(Features), MContext(MContext),<br>
MDHelper(VMContext), Root(0), Char(0) {<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CodeGenTBAA.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTBAA.h?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTBAA.h?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CodeGenTBAA.h (original)<br>
+++ cfe/trunk/lib/CodeGen/CodeGenTBAA.h Wed Jun 6 12:32:50 2012<br>
@@ -39,7 +39,6 @@<br>
/// while lowering AST types to LLVM types.<br>
class CodeGenTBAA {<br>
ASTContext &Context;<br>
- llvm::LLVMContext& VMContext;<br>
const CodeGenOptions &CodeGenOpts;<br>
const LangOptions &Features;<br>
MangleContext &MContext;<br>
<br>
Modified: cfe/trunk/lib/Parse/ParsePragma.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParsePragma.h?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParsePragma.h?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParsePragma.h (original)<br>
+++ cfe/trunk/lib/Parse/ParsePragma.h Wed Jun 6 12:32:50 2012<br>
@@ -30,10 +30,9 @@<br>
};<br>
<br>
class PragmaGCCVisibilityHandler : public PragmaHandler {<br>
- Sema &Actions;<br>
public:<br>
- explicit PragmaGCCVisibilityHandler(Sema &A) : PragmaHandler("visibility"),<br>
- Actions(A) {}<br>
+ explicit PragmaGCCVisibilityHandler(Sema &/*A*/)<br>
+ : PragmaHandler("visibility") {}<br>
<br>
virtual void HandlePragma(Preprocessor &PP, PragmaIntroducerKind Introducer,<br>
Token &FirstToken);<br>
@@ -70,11 +69,9 @@<br>
};<br>
<br>
class PragmaUnusedHandler : public PragmaHandler {<br>
- Sema &Actions;<br>
- Parser &parser;<br>
public:<br>
- PragmaUnusedHandler(Sema &A, Parser& p)<br>
- : PragmaHandler("unused"), Actions(A), parser(p) {}<br>
+ PragmaUnusedHandler(Sema &/*A*/)<br>
+ : PragmaHandler("unused") {}<br>
<br>
virtual void HandlePragma(Preprocessor &PP, PragmaIntroducerKind Introducer,<br>
Token &FirstToken);<br>
@@ -102,10 +99,9 @@<br>
<br>
class PragmaOpenCLExtensionHandler : public PragmaHandler {<br>
Sema &Actions;<br>
- Parser &parser;<br>
public:<br>
- PragmaOpenCLExtensionHandler(Sema &S, Parser& p) :<br>
- PragmaHandler("EXTENSION"), Actions(S), parser(p) {}<br>
+ PragmaOpenCLExtensionHandler(Sema &A) :<br>
+ PragmaHandler("EXTENSION"), Actions(A) {}<br>
virtual void HandlePragma(Preprocessor &PP, PragmaIntroducerKind Introducer,<br>
Token &FirstToken);<br>
};<br>
@@ -113,10 +109,9 @@<br>
<br>
class PragmaFPContractHandler : public PragmaHandler {<br>
Sema &Actions;<br>
- Parser &parser;<br>
public:<br>
- PragmaFPContractHandler(Sema &S, Parser& p) :<br>
- PragmaHandler("FP_CONTRACT"), Actions(S), parser(p) {}<br>
+ PragmaFPContractHandler(Sema &A) :<br>
+ PragmaHandler("FP_CONTRACT"), Actions(A) {}<br>
virtual void HandlePragma(Preprocessor &PP, PragmaIntroducerKind Introducer,<br>
Token &FirstToken);<br>
};<br>
<br>
Modified: cfe/trunk/lib/Parse/Parser.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/Parser.cpp (original)<br>
+++ cfe/trunk/lib/Parse/Parser.cpp Wed Jun 6 12:32:50 2012<br>
@@ -59,7 +59,7 @@<br>
MSStructHandler.reset(new PragmaMSStructHandler(actions));<br>
PP.AddPragmaHandler(MSStructHandler.get());<br>
<br>
- UnusedHandler.reset(new PragmaUnusedHandler(actions, *this));<br>
+ UnusedHandler.reset(new PragmaUnusedHandler(actions));<br>
PP.AddPragmaHandler(UnusedHandler.get());<br>
<br>
WeakHandler.reset(new PragmaWeakHandler(actions));<br>
@@ -68,12 +68,11 @@<br>
RedefineExtnameHandler.reset(new PragmaRedefineExtnameHandler(actions));<br>
PP.AddPragmaHandler(RedefineExtnameHandler.get());<br>
<br>
- FPContractHandler.reset(new PragmaFPContractHandler(actions, *this));<br>
+ FPContractHandler.reset(new PragmaFPContractHandler(actions));<br>
PP.AddPragmaHandler("STDC", FPContractHandler.get());<br>
<br>
if (getLangOpts().OpenCL) {<br>
- OpenCLExtensionHandler.reset(<br>
- new PragmaOpenCLExtensionHandler(actions, *this));<br>
+ OpenCLExtensionHandler.reset(new PragmaOpenCLExtensionHandler(actions));<br>
PP.AddPragmaHandler("OPENCL", OpenCLExtensionHandler.get());<br>
<br>
PP.AddPragmaHandler("OPENCL", FPContractHandler.get());<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaStmt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Wed Jun 6 12:32:50 2012<br>
@@ -1116,18 +1116,15 @@<br>
llvm::SmallPtrSet<VarDecl*, 8> &Decls;<br>
llvm::SmallVector<SourceRange, 10> &Ranges;<br>
bool Simple;<br>
- PartialDiagnostic &PDiag;<br>
public:<br>
typedef EvaluatedExprVisitor<DeclExtractor> Inherited;<br>
<br>
DeclExtractor(Sema &S, llvm::SmallPtrSet<VarDecl*, 8> &Decls,<br>
- llvm::SmallVector<SourceRange, 10> &Ranges,<br>
- PartialDiagnostic &PDiag) :<br>
+ llvm::SmallVector<SourceRange, 10> &Ranges) :<br>
Inherited(S.Context),<br>
Decls(Decls),<br>
Ranges(Ranges),<br>
- Simple(true),<br>
- PDiag(PDiag) {}<br>
+ Simple(true) {}<br>
<br>
bool isSimple() { return Simple; }<br>
<br>
@@ -1274,7 +1271,7 @@<br>
PartialDiagnostic PDiag = S.PDiag(diag::warn_variables_not_in_loop_body);<br>
llvm::SmallPtrSet<VarDecl*, 8> Decls;<br>
llvm::SmallVector<SourceRange, 10> Ranges;<br>
- DeclExtractor DE(S, Decls, Ranges, PDiag);<br>
+ DeclExtractor DE(S, Decls, Ranges);<br>
DE.Visit(Second);<br>
<br>
// Don't analyze complex conditionals.<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTReader.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Wed Jun 6 12:32:50 2012<br>
@@ -4144,7 +4144,6 @@<br>
class clang::TypeLocReader : public TypeLocVisitor<TypeLocReader> {<br>
ASTReader &Reader;<br>
ModuleFile &F;<br>
- llvm::BitstreamCursor &DeclsCursor;<br>
const ASTReader::RecordData &Record;<br>
unsigned &Idx;<br>
<br>
@@ -4161,7 +4160,7 @@<br>
public:<br>
TypeLocReader(ASTReader &Reader, ModuleFile &F,<br>
const ASTReader::RecordData &Record, unsigned &Idx)<br>
- : Reader(Reader), F(F), DeclsCursor(F.DeclsCursor), Record(Record), Idx(Idx)<br>
+ : Reader(Reader), F(F), Record(Record), Idx(Idx)<br>
{ }<br>
<br>
// We want compile-time assurance that we've enumerated all of<br>
@@ -4859,7 +4858,6 @@<br>
class DeclContextNameLookupVisitor {<br>
ASTReader &Reader;<br>
llvm::SmallVectorImpl<const DeclContext *> &Contexts;<br>
- const DeclContext *DC;<br>
DeclarationName Name;<br>
SmallVectorImpl<NamedDecl *> &Decls;<br>
<br>
@@ -4961,7 +4959,6 @@<br>
class DeclContextAllNamesVisitor {<br>
ASTReader &Reader;<br>
llvm::SmallVectorImpl<const DeclContext *> &Contexts;<br>
- const DeclContext *DC;<br>
llvm::DenseMap<DeclarationName, SmallVector<NamedDecl *, 8> > &Decls;<br>
<br>
public:<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp Wed Jun 6 12:32:50 2012<br>
@@ -1242,15 +1242,14 @@<br>
// Trait used for the on-disk hash table of header search information.<br>
class HeaderFileInfoTrait {<br>
ASTWriter &Writer;<br>
- const HeaderSearch &HS;<br>
<br>
// Keep track of the framework names we've used during serialization.<br>
SmallVector<char, 128> FrameworkStringData;<br>
llvm::StringMap<unsigned> FrameworkNameOffset;<br>
<br>
public:<br>
- HeaderFileInfoTrait(ASTWriter &Writer, const HeaderSearch &HS)<br>
- : Writer(Writer), HS(HS) { }<br>
+ HeaderFileInfoTrait(ASTWriter &Writer)<br>
+ : Writer(Writer) { }<br>
<br>
typedef const char *key_type;<br>
typedef key_type key_type_ref;<br>
@@ -1335,7 +1334,7 @@<br>
if (FilesByUID.size() > HS.header_file_size())<br>
FilesByUID.resize(HS.header_file_size());<br>
<br>
- HeaderFileInfoTrait GeneratorTrait(*this, HS);<br>
+ HeaderFileInfoTrait GeneratorTrait(*this);<br>
OnDiskChainedHashTableGenerator<HeaderFileInfoTrait> Generator;<br>
SmallVector<const char *, 4> SavedStrings;<br>
unsigned NumHeaderSearchEntries = 0;<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp Wed Jun 6 12:32:50 2012<br>
@@ -128,14 +128,13 @@<br>
public:<br>
SmallVector<const FieldDecl *, 10> FieldChain;<br>
private:<br>
- ASTContext &C;<br>
StoreManager &StoreMgr;<br>
MemRegionManager &MrMgr;<br>
Store store;<br>
public:<br>
- FindUninitializedField(ASTContext &c, StoreManager &storeMgr,<br>
+ FindUninitializedField(StoreManager &storeMgr,<br>
MemRegionManager &mrMgr, Store s)<br>
- : C(c), StoreMgr(storeMgr), MrMgr(mrMgr), store(s) {}<br>
+ : StoreMgr(storeMgr), MrMgr(mrMgr), store(s) {}<br>
<br>
bool Find(const TypedValueRegion *R) {<br>
QualType T = R->getValueType();<br>
@@ -165,8 +164,7 @@<br>
};<br>
<br>
const LazyCompoundValData *D = LV->getCVData();<br>
- FindUninitializedField F(C.getASTContext(),<br>
- C.getState()->getStateManager().getStoreManager(),<br>
+ FindUninitializedField F(C.getState()->getStateManager().getStoreManager(),<br>
C.getSValBuilder().getRegionManager(),<br>
D->getStore());<br>
<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/RetainCountChecker.cpp Wed Jun 6 12:32:50 2012<br>
@@ -1700,32 +1700,18 @@<br>
};<br>
<br>
class Leak : public CFRefBug {<br>
- const bool isReturn;<br>
- protected:<br>
- Leak(StringRef name, bool isRet)<br>
- : CFRefBug(name), isReturn(isRet) {<br>
+ public:<br>
+ Leak(StringRef name)<br>
+ : CFRefBug(name) {<br>
// Leaks should not be reported if they are post-dominated by a sink.<br>
setSuppressOnSink(true);<br>
}<br>
- public:<br>
<br>
const char *getDescription() const { return ""; }<br>
<br>
bool isLeak() const { return true; }<br>
};<br>
<br>
- class LeakAtReturn : public Leak {<br>
- public:<br>
- LeakAtReturn(StringRef name)<br>
- : Leak(name, true) {}<br>
- };<br>
-<br>
- class LeakWithinFunction : public Leak {<br>
- public:<br>
- LeakWithinFunction(StringRef name)<br>
- : Leak(name, false) {}<br>
- };<br>
-<br>
//===---------===//<br>
// Bug Reports. //<br>
//===---------===//<br>
@@ -2420,20 +2406,17 @@<br>
bool GCEnabled) const {<br>
if (GCEnabled) {<br>
if (!leakWithinFunctionGC)<br>
- leakWithinFunctionGC.reset(new LeakWithinFunction("Leak of object when "<br>
- "using garbage "<br>
- "collection"));<br>
+ leakWithinFunctionGC.reset(new Leak("Leak of object when using "<br>
+ "garbage collection"));<br>
return leakWithinFunctionGC.get();<br>
} else {<br>
if (!leakWithinFunction) {<br>
if (LOpts.getGC() == LangOptions::HybridGC) {<br>
- leakWithinFunction.reset(new LeakWithinFunction("Leak of object when "<br>
- "not using garbage "<br>
- "collection (GC) in "<br>
- "dual GC/non-GC "<br>
- "code"));<br>
+ leakWithinFunction.reset(new Leak("Leak of object when not using "<br>
+ "garbage collection (GC) in "<br>
+ "dual GC/non-GC code"));<br>
} else {<br>
- leakWithinFunction.reset(new LeakWithinFunction("Leak"));<br>
+ leakWithinFunction.reset(new Leak("Leak"));<br>
}<br>
}<br>
return leakWithinFunction.get();<br>
@@ -2443,17 +2426,17 @@<br>
CFRefBug *getLeakAtReturnBug(const LangOptions &LOpts, bool GCEnabled) const {<br>
if (GCEnabled) {<br>
if (!leakAtReturnGC)<br>
- leakAtReturnGC.reset(new LeakAtReturn("Leak of returned object when "<br>
- "using garbage collection"));<br>
+ leakAtReturnGC.reset(new Leak("Leak of returned object when using "<br>
+ "garbage collection"));<br>
return leakAtReturnGC.get();<br>
} else {<br>
if (!leakAtReturn) {<br>
if (LOpts.getGC() == LangOptions::HybridGC) {<br>
- leakAtReturn.reset(new LeakAtReturn("Leak of returned object when "<br>
- "not using garbage collection "<br>
- "(GC) in dual GC/non-GC code"));<br>
+ leakAtReturn.reset(new Leak("Leak of returned object when not using "<br>
+ "garbage collection (GC) in dual "<br>
+ "GC/non-GC code"));<br>
} else {<br>
- leakAtReturn.reset(new LeakAtReturn("Leak of returned object"));<br>
+ leakAtReturn.reset(new Leak("Leak of returned object"));<br>
}<br>
}<br>
return leakAtReturn.get();<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Checkers/VirtualCallChecker.cpp Wed Jun 6 12:32:50 2012<br>
@@ -46,7 +46,7 @@<br>
visited. */<br>
PostVisited /**< A CallExpr to this FunctionDecl is in the<br>
worklist, and the body has been visited. */<br>
- } K;<br>
+ };<br>
<br>
/// A DenseMap that records visited states of FunctionDecls.<br>
llvm::DenseMap<const FunctionDecl *, Kind> VisitedFunctions;<br>
<br>
Modified: cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp?rev=158086&r1=158085&r2=158086&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp?rev=158086&r1=158085&r2=158086&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp (original)<br>
+++ cfe/trunk/lib/StaticAnalyzer/Core/AnalysisManager.cpp Wed Jun 6 12:32:50 2012<br>
@@ -36,7 +36,7 @@<br>
Ctx(ctx), Diags(diags), LangOpts(lang), PD(pd),<br>
CreateStoreMgr(storemgr), CreateConstraintMgr(constraintmgr),<br>
CheckerMgr(checkerMgr),<br>
- AScope(ScopeDecl), MaxNodes(maxnodes), MaxVisit(maxvisit),<br>
+ MaxNodes(maxnodes), MaxVisit(maxvisit),<br>
VisualizeEGDot(vizdot), VisualizeEGUbi(vizubi), PurgeDead(purge),<br>
EagerlyAssume(eager), TrimGraph(trim),<br>
EagerlyTrimEGraph(eagerlyTrimEGraph),<br>
@@ -59,7 +59,6 @@<br>
CreateStoreMgr(ParentAM.CreateStoreMgr),<br>
CreateConstraintMgr(ParentAM.CreateConstraintMgr),<br>
CheckerMgr(ParentAM.CheckerMgr),<br>
- AScope(ScopeDecl),<br>
MaxNodes(ParentAM.MaxNodes),<br>
MaxVisit(ParentAM.MaxVisit),<br>
VisualizeEGDot(ParentAM.VisualizeEGDot),<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br>