aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseStmt.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2012-10-08 23:52:38 +0000
committerEli Friedman <eli.friedman@gmail.com>2012-10-08 23:52:38 +0000
commit3ef38eea7ce400718e4ab523b4704ae1fd8f940f (patch)
treecb380f13d938c4c72ff1711d22f463659fc16f61 /lib/Parse/ParseStmt.cpp
parent7716a6be1c2709ecf86747fc2fcf6b2e2a956db3 (diff)
Make sure we allow "#pragma options align=mac68k" in function-local contexts. <rdar://problem/12453134>
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@165462 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseStmt.cpp')
-rw-r--r--lib/Parse/ParseStmt.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Parse/ParseStmt.cpp b/lib/Parse/ParseStmt.cpp
index 776423c28b..635f61b821 100644
--- a/lib/Parse/ParseStmt.cpp
+++ b/lib/Parse/ParseStmt.cpp
@@ -254,6 +254,11 @@ Retry:
HandlePragmaPack();
return StmtEmpty();
+ case tok::annot_pragma_align:
+ ProhibitAttributes(Attrs);
+ HandlePragmaAlign();
+ return StmtEmpty();
+
case tok::annot_pragma_fp_contract:
ProhibitAttributes(Attrs);
HandlePragmaFPContract();