diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-04-20 21:48:54 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-04-20 21:48:54 +0000 |
| commit | 6bc11b14146b9a41402d0348438ff4edb1e344cd (patch) | |
| tree | a3128f15d970747b64d8aaaa66d9fe8c176bef8a /contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp | |
| parent | 554491ffbdcfe51993d5b436a9bbca7aba388dd3 (diff) | |
| parent | 583e75cce441388bc562fa225d23499261a0091e (diff) | |
Merge llvm, clang, lld and lldb trunk r300890, and update build glue.
Notes
Notes:
svn path=/projects/clang500-import/; revision=317230
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp b/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp index eaff9fe8eedf..7d78046d0684 100644 --- a/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp +++ b/contrib/llvm/tools/clang/lib/Parse/ParseStmt.cpp @@ -382,6 +382,10 @@ Retry: case tok::annot_pragma_dump: HandlePragmaDump(); return StmtEmpty(); + + case tok::annot_pragma_attribute: + HandlePragmaAttribute(); + return StmtEmpty(); } // If we reached this code, the statement must end in a semicolon. |