Make sure we allow "#pragma options align=mac68k" in function-local contexts. <rdar://problem/12453134>

llvm-svn: 165462

2 files changed, 17 insertions, 0 deletions

diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index 776423c28be..635f61b8213 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/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();
diff --git a/clang/test/Sema/pragma-align-mac68k.c b/clang/test/Sema/pragma-align-mac68k.c
index fb8da515bbc..64c693907f9 100644
--- a/clang/test/Sema/pragma-align-mac68k.c
+++ b/clang/test/Sema/pragma-align-mac68k.c
@@ -96,3 +96,15 @@ extern int a11_0[offsetof(struct s11, f0) == 0 ? 1 : -1];
 extern int a11_1[offsetof(struct s11, f1) == 2 ? 1 : -1];
 extern int a11_2[sizeof(struct s11) == 10 ? 1 : -1];
 extern int a11_3[__alignof(struct s11) == 2 ? 1 : -1];
+
+#pragma options align=reset
+
+void f12(void) {
+  #pragma options align=mac68k
+  struct s12 {
+    char f0;
+    int  f1;
+  };
+  #pragma options align=reset
+  extern int a12[sizeof(struct s12) == 6 ? 1 : -1];
+}