replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

A couple minor fixes to template instantiation for for-range loops. 

llvm-svn: 149440
This commit is contained in:
Eli Friedman 2012-01-31 22:45:40 +00:00
parent a223401498
commit 87d3280985
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Sema/TreeTransform.h
View File

@ -5738,10 +5738,18 @@ TreeTransform<Derived>::TransformCXXForRangeStmt(CXXForRangeStmt *S) {
ExprResult Cond = getDerived().TransformExpr(S->getCond());
if (Cond.isInvalid())
return StmtError();
if (Cond.get())
Cond = SemaRef.CheckBooleanCondition(Cond.take(), S->getColonLoc());
if (Cond.isInvalid())
return StmtError();
if (Cond.get())
Cond = SemaRef.MaybeCreateExprWithCleanups(Cond.take());
ExprResult Inc = getDerived().TransformExpr(S->getInc());
if (Inc.isInvalid())
return StmtError();
if (Inc.get())
Inc = SemaRef.MaybeCreateExprWithCleanups(Inc.take());
StmtResult LoopVar = getDerived().TransformStmt(S->getLoopVarStmt());
if (LoopVar.isInvalid())

11
clang/test/SemaCXX/for-range-examples.cpp
View File

@ -158,3 +158,14 @@ namespace test2 {
for (int x : a.xs) { } // expected-error {{'xs' is a private member of 'test2::A'}}
}
}
namespace test3 {
// Make sure this doesn't crash
struct A {};
struct B { ~B(); operator bool(); };
struct C { B operator!=(const C&); C& operator++(); int operator*(); };
C begin(const A&);
C end(const A&);
template<typename T> void f() { for (auto a : A()) {} }
void g() { f<int>(); }
}