diff options
| author | David Blaikie <dblaikie@gmail.com> | 2012-06-06 20:45:41 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2012-06-06 20:45:41 +0000 |
| commit | 581deb3da481053c4993c7600f97acf7768caac5 (patch) | |
| tree | 9c3cfe3a1f156e2ac3d7edc4d1a5fdaed4589c1a /lib/AST/ExprConstant.cpp | |
| parent | 1ada2a65833266c139010bedfad87e58e5a7d74d (diff) | |
Revert Decl's iterators back to pointer value_type rather than reference value_type
In addition, I've made the pointer and reference typedef 'void' rather than T*
just so they can't get misused. I would've omitted them entirely but
std::distance likes them to be there even if it doesn't use them.
This rolls back r155808 and r155869.
Review by Doug Gregor incorporating feedback from Chandler Carruth.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158104 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/ExprConstant.cpp')
| -rw-r--r-- | lib/AST/ExprConstant.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index d3ab84fc4a..e9cce9f23a 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -3418,7 +3418,7 @@ static bool HandleClassZeroInitialization(EvalInfo &Info, const Expr *E, continue; LValue Subobject = This; - if (!HandleLValueMember(Info, E, Subobject, &*I, &Layout)) + if (!HandleLValueMember(Info, E, Subobject, *I, &Layout)) return false; ImplicitValueInitExpr VIE(I->getType()); @@ -3443,9 +3443,9 @@ bool RecordExprEvaluator::ZeroInitialization(const Expr *E) { } LValue Subobject = This; - if (!HandleLValueMember(Info, E, Subobject, &*I)) + if (!HandleLValueMember(Info, E, Subobject, *I)) return false; - Result = APValue(&*I); + Result = APValue(*I); ImplicitValueInitExpr VIE(I->getType()); return EvaluateInPlace(Result.getUnionValue(), Info, Subobject, &VIE); } @@ -3536,7 +3536,7 @@ bool RecordExprEvaluator::VisitInitListExpr(const InitListExpr *E) { // FIXME: Diagnostics here should point to the end of the initializer // list, not the start. if (!HandleLValueMember(Info, HaveInit ? E->getInit(ElementNo) : E, - Subobject, &*Field, &Layout)) + Subobject, *Field, &Layout)) return false; // Perform an implicit value-initialization for members beyond the end of |