added parsing and sema for the SAVE stmt; improved spec diagnostics

1 files changed, 20 insertions, 9 deletions

diff --git a/lib/Sema/Sema.cpp b/lib/Sema/Sema.cpp
index bf18d61719..2acbc70faf 100644
--- a/lib/Sema/Sema.cpp
+++ b/lib/Sema/Sema.cpp
@@ -37,6 +37,11 @@ Sema::Sema(ASTContext &ctxt, DiagnosticsEngine &D)
 
 Sema::~Sema() {}
 
+// FIXME
+SourceRange Sema::getIdentifierRange(SourceLocation Loc, const IdentifierInfo *IDInfo) {
+  return SourceRange(Loc, SourceLocation::getFromPointer(Loc.getPointer()+IDInfo->getLength()));
+}
+
 // getContainingDC - Determines the context to return to after temporarily
 // entering a context.  This depends in an unnecessarily complicated way on the
 // exact ordering of callbacks from the parser.
@@ -660,15 +665,6 @@ VarDecl *Sema::ExpectVarRef(SourceLocation IDLoc,
 
 StmtResult Sema::ActOnCompoundStmt(ASTContext &C, SourceLocation Loc,
                                    ArrayRef<Stmt*> Body, Expr *StmtLabel) {
-  if(Body.size() == 1) {
-    auto Result = Body[0];
-    if(StmtLabel) {
-      DeclareStatementLabel(StmtLabel, Result);
-      Result->setLocation(Loc);
-      Result->setStmtLabel(StmtLabel);
-    }
-    return Result;
-  }
   auto Result = CompoundStmt::Create(C, Loc, Body, StmtLabel);
   if(StmtLabel) DeclareStatementLabel(StmtLabel, Result);
   return Result;
@@ -885,6 +881,21 @@ StmtResult Sema::ActOnINTRINSIC(ASTContext &C, SourceLocation Loc,
   return Result;
 }
 
+StmtResult Sema::ActOnSAVE(ASTContext &C, SourceLocation Loc, Expr *StmtLabel) {
+  auto Result = SaveStmt::Create(C, Loc, nullptr, StmtLabel);
+  if(StmtLabel) DeclareStatementLabel(StmtLabel, Result);
+  return Result;
+}
+
+StmtResult Sema::ActOnSAVE(ASTContext &C, SourceLocation Loc,
+                           SourceLocation IDLoc,
+                           const IdentifierInfo *IDInfo,
+                           Expr *StmtLabel) {
+  auto Result = SaveStmt::Create(C, IDLoc, IDInfo, StmtLabel);
+  if(StmtLabel) DeclareStatementLabel(StmtLabel, Result);
+  return Result;
+}
+
 /// FIXME: allow outer scope integer constants.
 /// FIXME: walk constant expressions like 1+1.
 ExprResult Sema::ActOnDATAOuterImpliedDoExpr(ASTContext &C,