[cfe-commits] r41523 - /cfe/trunk/Sema/SemaStmt.cpp
Chris Lattner
sabre at nondot.org
Mon Aug 27 21:55:48 PDT 2007
Author: lattner
Date: Mon Aug 27 23:55:47 2007
New Revision: 41523
URL: http://llvm.org/viewvc/llvm-project?rev=41523&view=rev
Log:
If the condition of a for statement is promoted, make sure the
implicit cast gets linked back into the AST.
Modified:
cfe/trunk/Sema/SemaStmt.cpp
Modified: cfe/trunk/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaStmt.cpp?rev=41523&r1=41522&r2=41523&view=diff
==============================================================================
--- cfe/trunk/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/Sema/SemaStmt.cpp Mon Aug 27 23:55:47 2007
@@ -446,23 +446,27 @@
Action::StmtResult
Sema::ParseForStmt(SourceLocation ForLoc, SourceLocation LParenLoc,
- StmtTy *First, ExprTy *Second, ExprTy *Third,
- SourceLocation RParenLoc, StmtTy *Body) {
+ StmtTy *first, ExprTy *second, ExprTy *third,
+ SourceLocation RParenLoc, StmtTy *body) {
+ Stmt *First = static_cast<Stmt*>(first);
+ Expr *Second = static_cast<Expr*>(second);
+ Expr *Third = static_cast<Expr*>(third);
+ Stmt *Body = static_cast<Stmt*>(body);
+
if (First) {
// C99 6.8.5p3: FIXME. Need to hack Parser::ParseForStatement() and
// declaration support to create a DeclStmt node. Once this is done,
// we can test for DeclStmt vs. Expr (already a sub-class of Stmt).
}
if (Second) {
- Expr *testExpr = (Expr *)Second;
- DefaultFunctionArrayConversion(testExpr);
- QualType testType = testExpr->getType();
+ DefaultFunctionArrayConversion(Second);
+ QualType SecondType = Second->getType();
- if (!testType->isScalarType()) // C99 6.8.5p2
+ if (!SecondType->isScalarType()) // C99 6.8.5p2
return Diag(ForLoc, diag::err_typecheck_statement_requires_scalar,
- testType.getAsString(), testExpr->getSourceRange());
+ SecondType.getAsString(), Second->getSourceRange());
}
- return new ForStmt((Stmt*)First, (Expr*)Second, (Expr*)Third, (Stmt*)Body);
+ return new ForStmt(First, Second, Third, Body);
}
More information about the cfe-commits
mailing list