diff options
Diffstat (limited to 'lib/Parse/ParsePragma.cpp')
| -rw-r--r-- | lib/Parse/ParsePragma.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/Parse/ParsePragma.cpp b/lib/Parse/ParsePragma.cpp index 17eba03c26..a6e2328d17 100644 --- a/lib/Parse/ParsePragma.cpp +++ b/lib/Parse/ParsePragma.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "ParsePragma.h" +#include "AstGuard.h" #include "clang/Basic/Diagnostic.h" #include "clang/Lex/Preprocessor.h" #include "clang/Parse/Action.h" @@ -35,12 +36,14 @@ void PragmaPackHandler::HandlePragma(Preprocessor &PP, Token &PackTok) { Action::PragmaPackKind Kind = Action::PPK_Default; IdentifierInfo *Name = 0; Action::ExprResult Alignment; + ExprGuard AlignmentGuard(Actions); SourceLocation LParenLoc = Tok.getLocation(); PP.Lex(Tok); if (Tok.is(tok::numeric_constant)) { Alignment = Actions.ActOnNumericConstant(Tok); if (Alignment.isInvalid) return; + AlignmentGuard.reset(Alignment); PP.Lex(Tok); } else if (Tok.is(tok::identifier)) { @@ -66,6 +69,7 @@ void PragmaPackHandler::HandlePragma(Preprocessor &PP, Token &PackTok) { Alignment = Actions.ActOnNumericConstant(Tok); if (Alignment.isInvalid) return; + AlignmentGuard.reset(Alignment); PP.Lex(Tok); } else if (Tok.is(tok::identifier)) { @@ -83,6 +87,7 @@ void PragmaPackHandler::HandlePragma(Preprocessor &PP, Token &PackTok) { Alignment = Actions.ActOnNumericConstant(Tok); if (Alignment.isInvalid) return; + AlignmentGuard.reset(Alignment); PP.Lex(Tok); } @@ -100,7 +105,7 @@ void PragmaPackHandler::HandlePragma(Preprocessor &PP, Token &PackTok) { } SourceLocation RParenLoc = Tok.getLocation(); - Actions.ActOnPragmaPack(Kind, Name, Alignment.Val, PackLoc, + Actions.ActOnPragmaPack(Kind, Name, AlignmentGuard.take(), PackLoc, LParenLoc, RParenLoc); } |