From: Fariborz Jahanian Date: Mon, 12 Jul 2010 18:12:03 +0000 (+0000) Subject: Compute Type dependent-ness of BlockDeclRefExpr X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84ca008a462b515f63871253f494d53c9190363c;p=clang Compute Type dependent-ness of BlockDeclRefExpr on the fly when constructing it. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108166 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h index 5cf285bad0..807644349e 100644 --- a/include/clang/AST/Expr.h +++ b/include/clang/AST/Expr.h @@ -3398,9 +3398,8 @@ public: // FIXME: Fix type/value dependence! BlockDeclRefExpr(ValueDecl *d, QualType t, SourceLocation l, bool ByRef, bool constAdded = false, - Stmt *copyConstructorVal = 0, - bool hasDependentType = false) - : Expr(BlockDeclRefExprClass, t, hasDependentType, false), + Stmt *copyConstructorVal = 0) + : Expr(BlockDeclRefExprClass, t, (!t.isNull() && t->isDependentType()),false), D(d), Loc(l), IsByRef(ByRef), ConstQualAdded(constAdded), CopyConstructorVal(copyConstructorVal) {} diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 53886e108e..9f9858001e 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1747,8 +1747,7 @@ Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS, QualType T = VD->getType(); BlockDeclRefExpr *BDRE = new (Context) BlockDeclRefExpr(VD, ExprTy, Loc, false, - constAdded, 0, - (getLangOptions().CPlusPlus && T->isDependentType())); + constAdded); if (getLangOptions().CPlusPlus) { if (!T->isDependentType() && !T->isReferenceType()) { Expr *E = new (Context)