maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Internally store the body of a BlockExpr using a Stmt* instead of a CompoundStmt*, and use the getBody() method to do the appropriate checking. This both removes the type-punning warnings in Expr.cpp and also makes BlockExpr have more consistency checks against modifications to its body (via StmtIterator). 

llvm-svn: 56710
This commit is contained in:
Ted Kremenek 2008-09-26 23:24:14 +00:00
parent 2e53c51914
commit 8bafa2cf9f
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/AST/Expr.h
View File

@ -1492,7 +1492,7 @@ private:
class BlockExpr : public Expr {
SourceLocation CaretLocation;
llvm::SmallVector<ParmVarDecl*, 8> Args;
CompoundStmt *Body;
Stmt *Body;
public:
BlockExpr(SourceLocation caretloc, QualType ty, ParmVarDecl **args,
unsigned numargs, CompoundStmt *body) : Expr(BlockExprClass, ty),
@ -1503,8 +1503,8 @@ public:
/// getFunctionType - Return the underlying function type for this block.
const FunctionType *getFunctionType() const;
const CompoundStmt *getBody() const { return Body; }
CompoundStmt *getBody() { return Body; }
const CompoundStmt *getBody() const { return cast<CompoundStmt>(Body); }
CompoundStmt *getBody() { return cast<CompoundStmt>(Body); }
virtual SourceRange getSourceRange() const {
return SourceRange(getCaretLocation(), Body->getLocEnd());

13
clang/lib/AST/Expr.cpp
View File

@ -1460,13 +1460,8 @@ Stmt::child_iterator ObjCMessageExpr::child_end() {
}
// Blocks
Stmt::child_iterator BlockExpr::child_begin() {
return reinterpret_cast<Stmt**>(&Body);
}
Stmt::child_iterator BlockExpr::child_end() {
return reinterpret_cast<Stmt**>(&Body)+1;
}
Stmt::child_iterator BlockDeclRefExpr::child_begin(){return child_iterator();}
Stmt::child_iterator BlockDeclRefExpr::child_end() { return child_iterator();}
Stmt::child_iterator BlockExpr::child_begin() { return &Body; }
Stmt::child_iterator BlockExpr::child_end() { return &Body+1; }
Stmt::child_iterator BlockDeclRefExpr::child_begin() { return child_iterator();}
Stmt::child_iterator BlockDeclRefExpr::child_end() { return child_iterator(); }