[cfe-commits] r65070 - in /cfe/trunk: include/clang/AST/Expr.h lib/AST/ExprConstant.cpp lib/AST/StmtSerialization.cpp lib/CodeGen/CGExprConstant.cpp lib/Sema/Sema.h lib/Sema/SemaExpr.cpp
Mike Stump
mrs at apple.com
Thu Feb 19 14:01:56 PST 2009
Author: mrs
Date: Thu Feb 19 16:01:56 2009
New Revision: 65070
URL: http://llvm.org/viewvc/llvm-project?rev=65070&view=rev
Log:
Add enough checking to ensure that non-constant block literals don't
appear to be constant. I'll probably redo this and throw it all away
later once we have codegen for BlockDeclRefExprs.
Modified:
cfe/trunk/include/clang/AST/Expr.h
cfe/trunk/lib/AST/ExprConstant.cpp
cfe/trunk/lib/AST/StmtSerialization.cpp
cfe/trunk/lib/CodeGen/CGExprConstant.cpp
cfe/trunk/lib/Sema/Sema.h
cfe/trunk/lib/Sema/SemaExpr.cpp
Modified: cfe/trunk/include/clang/AST/Expr.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Expr.h?rev=65070&r1=65069&r2=65070&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Expr.h (original)
+++ cfe/trunk/include/clang/AST/Expr.h Thu Feb 19 16:01:56 2009
@@ -2051,9 +2051,11 @@
class BlockExpr : public Expr {
protected:
BlockDecl *TheBlock;
+ bool HasBlockDeclRefExprs;
public:
- BlockExpr(BlockDecl *BD, QualType ty) : Expr(BlockExprClass, ty),
- TheBlock(BD) {}
+ BlockExpr(BlockDecl *BD, QualType ty, bool hasBlockDeclRefExprs)
+ : Expr(BlockExprClass, ty),
+ TheBlock(BD), HasBlockDeclRefExprs(hasBlockDeclRefExprs) {}
const BlockDecl *getBlockDecl() const { return TheBlock; }
BlockDecl *getBlockDecl() { return TheBlock; }
@@ -2070,6 +2072,10 @@
/// getFunctionType - Return the underlying function type for this block.
const FunctionType *getFunctionType() const;
+ /// hasBlockDeclRefExprs - Return true iff the block has BlockDeclRefExpr
+ /// contained inside.
+ bool hasBlockDeclRefExprs() const { return HasBlockDeclRefExprs; }
+
static bool classof(const Stmt *T) {
return T->getStmtClass() == BlockExprClass;
}
Modified: cfe/trunk/lib/AST/ExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ExprConstant.cpp?rev=65070&r1=65069&r2=65070&view=diff
==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Thu Feb 19 16:01:56 2009
@@ -260,7 +260,11 @@
APValue VisitAddrLabelExpr(AddrLabelExpr *E)
{ return APValue(E, 0); }
APValue VisitCallExpr(CallExpr *E);
- APValue VisitBlockExpr(BlockExpr *E) { return APValue(E, 0); }
+ APValue VisitBlockExpr(BlockExpr *E) {
+ if (!E->hasBlockDeclRefExprs())
+ return APValue(E, 0);
+ return APValue();
+ }
APValue VisitConditionalOperator(ConditionalOperator *E);
};
} // end anonymous namespace
Modified: cfe/trunk/lib/AST/StmtSerialization.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/StmtSerialization.cpp?rev=65070&r1=65069&r2=65070&view=diff
==============================================================================
--- cfe/trunk/lib/AST/StmtSerialization.cpp (original)
+++ cfe/trunk/lib/AST/StmtSerialization.cpp Thu Feb 19 16:01:56 2009
@@ -1290,11 +1290,14 @@
void BlockExpr::EmitImpl(Serializer& S) const {
S.Emit(getType());
S.EmitOwnedPtr(TheBlock);
+ S.EmitBool(HasBlockDeclRefExprs);
}
BlockExpr* BlockExpr::CreateImpl(Deserializer& D, ASTContext& C) {
QualType T = QualType::ReadVal(D);
- return new BlockExpr(cast<BlockDecl>(D.ReadOwnedPtr<Decl>(C)),T);
+ BlockDecl *B = cast<BlockDecl>(D.ReadOwnedPtr<Decl>(C));
+ bool H = D.ReadBool();
+ return new BlockExpr(B,T,H);
}
void BlockDeclRefExpr::EmitImpl(Serializer& S) const {
Modified: cfe/trunk/lib/CodeGen/CGExprConstant.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprConstant.cpp?rev=65070&r1=65069&r2=65070&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprConstant.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprConstant.cpp Thu Feb 19 16:01:56 2009
@@ -382,6 +382,8 @@
}
llvm::Constant *VisitBlockExpr(const BlockExpr *E) {
+ assert (!E->hasBlockDeclRefExprs() && "global block with BlockDeclRefs");
+
const char *Name = "";
if (const NamedDecl *ND = dyn_cast<NamedDecl>(CGF->CurFuncDecl))
Name = ND->getNameAsString().c_str();
@@ -615,7 +617,9 @@
return CGM.GetAddrOfConstantCFString(S);
}
case Expr::BlockExprClass: {
- return CGF->BuildBlockLiteralTmp(cast<BlockExpr>(E));
+ BlockExpr *B = cast<BlockExpr>(E);
+ if (!B->hasBlockDeclRefExprs())
+ return CGF->BuildBlockLiteralTmp(B);
}
}
Modified: cfe/trunk/lib/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/Sema.h?rev=65070&r1=65069&r2=65070&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/Sema.h (original)
+++ cfe/trunk/lib/Sema/Sema.h Thu Feb 19 16:01:56 2009
@@ -2004,7 +2004,8 @@
llvm::SmallVector<ParmVarDecl*, 8> Params;
bool hasPrototype;
bool isVariadic;
-
+ bool hasBlockDeclRefExprs;
+
BlockDecl *TheDecl;
/// TheScope - This is the scope for the block itself, which contains
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=65070&r1=65069&r2=65070&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Thu Feb 19 16:01:56 2009
@@ -865,6 +865,9 @@
// as they do not get snapshotted.
//
if (CurBlock && ShouldSnapshotBlockValueReference(CurBlock, VD)) {
+ // Blocks that have these can't be constant.
+ CurBlock->hasBlockDeclRefExprs = true;
+
// The BlocksAttr indicates the variable is bound by-reference.
if (VD->getAttr<BlocksAttr>())
return Owned(new (Context) BlockDeclRefExpr(VD,
@@ -4331,6 +4334,7 @@
BSI->ReturnType = 0;
BSI->TheScope = BlockScope;
+ BSI->hasBlockDeclRefExprs = false;
BSI->TheDecl = BlockDecl::Create(Context, CurContext, CaretLoc);
PushDeclContext(BlockScope, BSI->TheDecl);
@@ -4442,7 +4446,7 @@
BlockTy = Context.getBlockPointerType(BlockTy);
BSI->TheDecl->setBody(Body.take());
- return new (Context) BlockExpr(BSI->TheDecl, BlockTy);
+ return new (Context) BlockExpr(BSI->TheDecl, BlockTy, BSI->hasBlockDeclRefExprs);
}
Sema::ExprResult Sema::ActOnVAArg(SourceLocation BuiltinLoc,
More information about the cfe-commits
mailing list