Constify LocationContext* (parent) and Stmt* fields in LocationContext.

llvm-svn: 79700
This commit is contained in:
Ted Kremenek 2009-08-21 23:39:58 +00:00
parent da21f27e09
commit 00aeae98b5
2 changed files with 30 additions and 23 deletions

View File

@ -71,10 +71,11 @@ public:
private:
ContextKind Kind;
AnalysisContext *Ctx;
LocationContext *Parent;
const LocationContext *Parent;
protected:
LocationContext(ContextKind k, AnalysisContext *ctx, LocationContext *parent)
LocationContext(ContextKind k, AnalysisContext *ctx,
const LocationContext *parent)
: Kind(k), Ctx(ctx), Parent(parent) {}
public:
@ -82,7 +83,7 @@ public:
AnalysisContext *getAnalysisContext() const { return Ctx; }
LocationContext *getParent() const { return Parent; }
const LocationContext *getParent() const { return Parent; }
const Decl *getDecl() const { return getAnalysisContext()->getDecl(); }
@ -101,16 +102,17 @@ public:
}
static void Profile(llvm::FoldingSetNodeID &ID, ContextKind k,
AnalysisContext *ctx, LocationContext *parent);
AnalysisContext *ctx, const LocationContext *parent);
static bool classof(const LocationContext*) { return true; }
};
class StackFrameContext : public LocationContext {
Stmt *CallSite;
const Stmt *CallSite;
public:
StackFrameContext(AnalysisContext *ctx, LocationContext *parent, Stmt *s)
StackFrameContext(AnalysisContext *ctx, const LocationContext *parent,
const Stmt *s)
: LocationContext(StackFrame, ctx, parent), CallSite(s) {}
void Profile(llvm::FoldingSetNodeID &ID) {
@ -118,7 +120,7 @@ public:
}
static void Profile(llvm::FoldingSetNodeID &ID, AnalysisContext *ctx,
LocationContext *parent, Stmt *s);
const LocationContext *parent, const Stmt *s);
static bool classof(const LocationContext* Ctx) {
return Ctx->getKind() == StackFrame;
@ -126,10 +128,11 @@ public:
};
class ScopeContext : public LocationContext {
Stmt *Enter;
const Stmt *Enter;
public:
ScopeContext(AnalysisContext *ctx, LocationContext *parent, Stmt *s)
ScopeContext(AnalysisContext *ctx, const LocationContext *parent,
const Stmt *s)
: LocationContext(Scope, ctx, parent), Enter(s) {}
void Profile(llvm::FoldingSetNodeID &ID) {
@ -137,7 +140,7 @@ public:
}
static void Profile(llvm::FoldingSetNodeID &ID, AnalysisContext *ctx,
LocationContext *parent, Stmt *s);
const LocationContext *parent, const Stmt *s);
static bool classof(const LocationContext* Ctx) {
return Ctx->getKind() == Scope;
@ -148,13 +151,13 @@ class LocationContextManager {
llvm::FoldingSet<LocationContext> Contexts;
public:
StackFrameContext *getStackFrame(AnalysisContext *ctx,LocationContext *parent,
Stmt *s);
ScopeContext *getScope(AnalysisContext *ctx,LocationContext *parent, Stmt *s);
StackFrameContext *getStackFrame(AnalysisContext *ctx,
const LocationContext *parent,
const Stmt *s);
ScopeContext *getScope(AnalysisContext *ctx, const LocationContext *parent,
const Stmt *s);
};
}
} // end clang namespace
#endif

View File

@ -81,26 +81,29 @@ AnalysisContext *AnalysisContextManager::getContext(Decl *D) {
}
void LocationContext::Profile(llvm::FoldingSetNodeID &ID, ContextKind k,
AnalysisContext *ctx, LocationContext *parent) {
AnalysisContext *ctx,
const LocationContext *parent) {
ID.AddInteger(k);
ID.AddPointer(ctx);
ID.AddPointer(parent);
}
void StackFrameContext::Profile(llvm::FoldingSetNodeID &ID,AnalysisContext *ctx,
LocationContext *parent, Stmt *s) {
const LocationContext *parent, const Stmt *s) {
LocationContext::Profile(ID, StackFrame, ctx, parent);
ID.AddPointer(s);
}
void ScopeContext::Profile(llvm::FoldingSetNodeID &ID, AnalysisContext *ctx,
LocationContext *parent, Stmt *s) {
const LocationContext *parent, const Stmt *s) {
LocationContext::Profile(ID, Scope, ctx, parent);
ID.AddPointer(s);
}
StackFrameContext *LocationContextManager::getStackFrame(AnalysisContext *ctx,
LocationContext *parent, Stmt *s) {
StackFrameContext*
LocationContextManager::getStackFrame(AnalysisContext *ctx,
const LocationContext *parent,
const Stmt *s) {
llvm::FoldingSetNodeID ID;
StackFrameContext::Profile(ID, ctx, parent, s);
void *InsertPos;
@ -115,7 +118,8 @@ StackFrameContext *LocationContextManager::getStackFrame(AnalysisContext *ctx,
}
ScopeContext *LocationContextManager::getScope(AnalysisContext *ctx,
LocationContext *parent, Stmt *s) {
const LocationContext *parent,
const Stmt *s) {
llvm::FoldingSetNodeID ID;
ScopeContext::Profile(ID, ctx, parent, s);
void *InsertPos;