[Modules][PCH] Serialize #pragma pack

This patch serializes the state of #pragma pack. It preserves the state of the
pragma from a PCH/from modules in a file that uses that PCH/those modules.

rdar://21359084

Differential Revision: https://reviews.llvm.org/D31241

llvm-svn: 299226

4 files changed, 29 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/module.map b/clang/test/Modules/Inputs/module.map
index 2beb942861a..dcb60bea851 100644
--- a/clang/test/Modules/Inputs/module.map
+++ b/clang/test/Modules/Inputs/module.map
@@ -265,6 +265,22 @@ module diag_pragma {
   header "diag_pragma.h"
 }
 
+module pragma_pack_set {
+  header "pragma_pack_set.h"
+}
+
+module pragma_pack_push {
+  header "pragma_pack_push.h"
+}
+
+module pragma_pack_empty {
+  header "empty.h"
+}
+
+module pragma_pack_reset_push {
+  header "pragma_pack_reset_push.h"
+}
+
 module dummy {
   header "dummy.h"
 }
diff --git a/clang/test/Modules/Inputs/pragma_pack_push.h b/clang/test/Modules/Inputs/pragma_pack_push.h
new file mode 100644
index 00000000000..4fc66e51cf8
--- /dev/null
+++ b/clang/test/Modules/Inputs/pragma_pack_push.h
@@ -0,0 +1,6 @@
+
+#pragma pack (push, 4)
+#pragma pack (push, 2)
+#pragma pack (push, 1)
+#pragma pack (pop)
+
diff --git a/clang/test/Modules/Inputs/pragma_pack_reset_push.h b/clang/test/Modules/Inputs/pragma_pack_reset_push.h
new file mode 100644
index 00000000000..18f50a00952
--- /dev/null
+++ b/clang/test/Modules/Inputs/pragma_pack_reset_push.h
@@ -0,0 +1,4 @@
+
+#pragma pack ()
+#pragma pack (push, 4)
+
diff --git a/clang/test/Modules/Inputs/pragma_pack_set.h b/clang/test/Modules/Inputs/pragma_pack_set.h
new file mode 100644
index 00000000000..b123c116ea1
--- /dev/null
+++ b/clang/test/Modules/Inputs/pragma_pack_set.h
@@ -0,0 +1,3 @@
+
+#pragma pack (1)
+