diff options
| -rw-r--r-- | include/clang/AST/Expr.h | 6 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h index 9d1ba48a35..5cf285bad0 100644 --- a/include/clang/AST/Expr.h +++ b/include/clang/AST/Expr.h @@ -3398,8 +3398,10 @@ public: // FIXME: Fix type/value dependence! BlockDeclRefExpr(ValueDecl *d, QualType t, SourceLocation l, bool ByRef, bool constAdded = false, - Stmt *copyConstructorVal = 0) - : Expr(BlockDeclRefExprClass, t, false, false), D(d), Loc(l), IsByRef(ByRef), + Stmt *copyConstructorVal = 0, + bool hasDependentType = false) + : Expr(BlockDeclRefExprClass, t, hasDependentType, false), + D(d), Loc(l), IsByRef(ByRef), ConstQualAdded(constAdded), CopyConstructorVal(copyConstructorVal) {} // \brief Build an empty reference to a declared variable in a diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 57b4232294..53886e108e 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1744,10 +1744,11 @@ Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS, // Variable will be bound by-copy, make it const within the closure. ExprTy.addConst(); + QualType T = VD->getType(); BlockDeclRefExpr *BDRE = new (Context) BlockDeclRefExpr(VD, ExprTy, Loc, false, - constAdded); - QualType T = VD->getType(); + constAdded, 0, + (getLangOptions().CPlusPlus && T->isDependentType())); if (getLangOptions().CPlusPlus) { if (!T->isDependentType() && !T->isReferenceType()) { Expr *E = new (Context) @@ -1765,8 +1766,6 @@ Sema::BuildDeclarationNameExpr(const CXXScopeSpec &SS, BDRE->setCopyConstructorExpr(Init); } } - else if (T->isDependentType()) - BDRE->setTypeDependent(true); } return Owned(BDRE); } |