diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Parse/ParseObjc.cpp | 15 | 
1 files changed, 14 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp index 6ca0ad855f5..ff33d5fb96b 100644 --- a/clang/lib/Parse/ParseObjc.cpp +++ b/clang/lib/Parse/ParseObjc.cpp @@ -2585,13 +2585,26 @@ StmtResult Parser::ParseObjCTryStmt(SourceLocation atLoc) {        ParseScope FinallyScope(this,                                Scope::DeclScope | Scope::CompoundStmtScope); +      bool ShouldCapture = +          getTargetInfo().getTriple().isWindowsMSVCEnvironment(); +      if (ShouldCapture) +        Actions.ActOnCapturedRegionStart(Tok.getLocation(), getCurScope(), +                                         CR_ObjCAtFinally, 1); +        StmtResult FinallyBody(true);        if (Tok.is(tok::l_brace))          FinallyBody = ParseCompoundStatementBody();        else          Diag(Tok, diag::err_expected) << tok::l_brace; -      if (FinallyBody.isInvalid()) + +      if (FinallyBody.isInvalid()) {          FinallyBody = Actions.ActOnNullStmt(Tok.getLocation()); +        if (ShouldCapture) +          Actions.ActOnCapturedRegionError(); +      } else if (ShouldCapture) { +        FinallyBody = Actions.ActOnCapturedRegionEnd(FinallyBody.get()); +      } +        FinallyStmt = Actions.ActOnObjCAtFinallyStmt(AtCatchFinallyLoc,                                                     FinallyBody.get());        catch_or_finally_seen = true;  | 

