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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65070 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExprConstant.cpp b/lib/CodeGen/CGExprConstant.cpp
index 523014f..8cfd60c 100644
--- a/lib/CodeGen/CGExprConstant.cpp
+++ b/lib/CodeGen/CGExprConstant.cpp
@@ -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);
}
}